Index: sys/conf/NOTES
===================================================================
--- sys/conf/NOTES	(revision 224243)
+++ sys/conf/NOTES	(working copy)
@@ -499,16 +499,6 @@ options 	DIAGNOSTIC
 options 	REGRESSION
 
 #
-# RESTARTABLE_PANICS allows one to continue from a panic as if it were
-# a call to the debugger to continue from a panic as instead.  It is only
-# useful if a kernel debugger is present.  To restart from a panic, reset
-# the panicstr variable to NULL and continue execution.  This option is
-# for development use only and should NOT be used in production systems
-# to "workaround" a panic.
-#
-#options 	RESTARTABLE_PANICS
-
-#
 # This option lets some drivers co-exist that can't co-exist in a running
 # system.  This is used to be able to compile all kernel code in one go for
 # quality assurance purposes (like this file, which the option takes it name
Index: sys/conf/options
===================================================================
--- sys/conf/options	(revision 224243)
+++ sys/conf/options	(working copy)
@@ -579,7 +579,6 @@ LOCK_PROFILING		opt_global.h
 LOCK_PROFILING_FAST	opt_global.h
 MSIZE			opt_global.h
 REGRESSION		opt_global.h
-RESTARTABLE_PANICS	opt_global.h
 RWLOCK_NOINLINE		opt_global.h
 SX_NOINLINE		opt_global.h
 VFS_BIO_DEBUG		opt_global.h
Index: sys/kern/kern_shutdown.c
===================================================================
--- sys/kern/kern_shutdown.c	(revision 224243)
+++ sys/kern/kern_shutdown.c	(working copy)
@@ -585,16 +585,7 @@ panic(const char *fmt, ...)
 		kdb_backtrace();
 	if (debugger_on_panic)
 		kdb_enter(KDB_WHY_PANIC, "panic");
-#ifdef RESTARTABLE_PANICS
-	/* See if the user aborted the panic, in which case we continue. */
-	if (panicstr == NULL) {
-#ifdef SMP
-		atomic_store_rel_int(&panic_cpu, NOCPU);
 #endif
-		return;
-	}
-#endif
-#endif
 	/*thread_lock(td); */
 	td->td_flags |= TDF_INPANIC;
 	/* thread_unlock(td); */
Index: sys/netgraph/ng_parse.c
===================================================================
--- sys/netgraph/ng_parse.c	(revision 224243)
+++ sys/netgraph/ng_parse.c	(working copy)
@@ -374,9 +374,6 @@ ng_int8_unparse(const struct ng_parse_type *type,
 		break;
 	default:
 		panic("%s: unknown type", __func__);
-#ifdef	RESTARTABLE_PANICS
-		return(0);
-#endif
 	}
 	if ((error = ng_parse_append(&cbuf, &cbuflen, fmt, fval)) != 0)
 		return (error);
@@ -473,9 +470,6 @@ ng_int16_unparse(const struct ng_parse_type *type,
 		break;
 	default:
 		panic("%s: unknown type", __func__);
-#ifdef	RESTARTABLE_PANICS
-		return(0);
-#endif
 	}
 	if ((error = ng_parse_append(&cbuf, &cbuflen, fmt, fval)) != 0)
 		return (error);
@@ -575,9 +569,6 @@ ng_int32_unparse(const struct ng_parse_type *type,
 		break;
 	default:
 		panic("%s: unknown type", __func__);
-#ifdef	RESTARTABLE_PANICS
-		return(0);
-#endif
 	}
 	if ((error = ng_parse_append(&cbuf, &cbuflen, fmt, fval)) != 0)
 		return (error);
@@ -673,9 +664,6 @@ ng_int64_unparse(const struct ng_parse_type *type,
 		break;
 	default:
 		panic("%s: unknown type", __func__);
-#ifdef	RESTARTABLE_PANICS
-		return(0);
-#endif
 	}
 	if ((error = ng_parse_append(&cbuf, &cbuflen, fmt, fval)) != 0)
 		return (error);
Index: sys/netgraph/ng_ether.c
===================================================================
--- sys/netgraph/ng_ether.c	(revision 224243)
+++ sys/netgraph/ng_ether.c	(working copy)
@@ -604,9 +604,6 @@ ng_ether_rcvdata(hook_p hook, item_p item)
 	NG_FREE_ITEM(item);
 
 	panic("%s: weird hook", __func__);
-#ifdef RESTARTABLE_PANICS /* so we don't get an error msg in LINT */
-	return (0);
-#endif
 }
 
 /*
Index: sys/netgraph/ng_mppc.c
===================================================================
--- sys/netgraph/ng_mppc.c	(revision 224243)
+++ sys/netgraph/ng_mppc.c	(working copy)
@@ -404,9 +404,6 @@ ng_mppc_rcvdata(hook_p hook, item_p item)
 
 	/* Oops */
 	panic("%s: unknown hook", __func__);
-#ifdef RESTARTABLE_PANICS
-	return (EINVAL);
-#endif
 }
 
 /*
Index: sys/sys/systm.h
===================================================================
--- sys/sys/systm.h	(revision 224243)
+++ sys/sys/systm.h	(working copy)
@@ -160,11 +160,7 @@ void	*hashinit_flags(int count, struct malloc_type
 void	*phashinit(int count, struct malloc_type *type, u_long *nentries);
 void	g_waitidle(void);
 
-#ifdef RESTARTABLE_PANICS
-void	panic(const char *, ...) __printflike(1, 2);
-#else
 void	panic(const char *, ...) __dead2 __printflike(1, 2);
-#endif
 
 void	cpu_boot(int);
 void	cpu_flush_dcache(void *, size_t);