From 8f7869622da7c563da99e4e96bc4c4cf63d8d96a Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=BB=84=E6=B6=9B?= Date: Sat, 30 Jul 2011 23:09:40 +0800 Subject: [PATCH] Revert "Add build option to to set the default panic timeout." This reverts commit 207f66e23a69bc23265e1f133702bc59c3096696. --- init/Kconfig | 6 ------ kernel/panic.c | 5 +---- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/init/Kconfig b/init/Kconfig index 184a603ad72b..714597c6f842 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -738,12 +738,6 @@ config SYSCTL config ANON_INODES bool -config PANIC_TIMEOUT - int "Default panic timeout" - default 0 - help - Set default panic timeout. - menuconfig EMBEDDED bool "Configure standard kernel features (for small systems)" help diff --git a/kernel/panic.c b/kernel/panic.c index 5fc6031d1958..96b45d0b4ba5 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -29,10 +29,7 @@ static int pause_on_oops; static int pause_on_oops_flag; static DEFINE_SPINLOCK(pause_on_oops_lock); -#ifndef CONFIG_PANIC_TIMEOUT -#define CONFIG_PANIC_TIMEOUT 0 -#endif -int panic_timeout = CONFIG_PANIC_TIMEOUT; +int panic_timeout; ATOMIC_NOTIFIER_HEAD(panic_notifier_list); -- 2.34.1