[PATCH] the scheduled unexport of panic_timeout

Implement the scheduled unexport of panic_timeout.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 59d0c74c79c955d4859e0c7cb3de222c14a23a1a..293fed113dff3fe08dbffb4db235ca62612ea7fc 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -71,14 +71,6 @@ Who: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
 
 ---------------------------
 
-What:  remove EXPORT_SYMBOL(panic_timeout)
-When:  April 2006
-Files: kernel/panic.c
-Why:   No modular usage in the kernel.
-Who:   Adrian Bunk <bunk@stusta.de>
-
----------------------------
-
 What:  remove EXPORT_SYMBOL(insert_resource)
 When:  April 2006
 Files: kernel/resource.c

diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index a3720f973ea58f5ce6515366de2e95acff03f667..e1bd0842f6a13e71ad0b781d4a5bdf6605986fbe 100644 (file)
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -176,7 +176,7 @@ static inline void console_verbose(void)
 
 extern void bust_spinlocks(int yes);
 extern int oops_in_progress;           /* If set, an oops, panic(), BUG() or die() is in progress */
-extern __deprecated_for_modules int panic_timeout;
+extern int panic_timeout;
 extern int panic_on_oops;
 extern int tainted;
 extern const char *print_tainted(void);

diff --git a/kernel/panic.c b/kernel/panic.c
index f895c7c01d5b18b4140dae5e35b284589380e481..cc2a4c9c36ac231781a41fba4031a17bc3b1f7e7 100644 (file)
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -27,7 +27,6 @@ static int pause_on_oops_flag;
 static DEFINE_SPINLOCK(pause_on_oops_lock);
 
 int panic_timeout;
-EXPORT_SYMBOL(panic_timeout);
 
 ATOMIC_NOTIFIER_HEAD(panic_notifier_list);