From a334d4710e3c8bc0859603b7aaa812f465db3b05 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Mon, 10 Apr 2006 22:53:59 -0700 Subject: [PATCH] --- yaml --- r: 25497 b: refs/heads/master c: aa7271076ae6547d7f370ad7e91ef86fdb318f17 h: refs/heads/master i: 25495: 940294727d70d2257f4c519586d3c9ae16048069 v: v3 --- [refs] | 2 +- trunk/Documentation/feature-removal-schedule.txt | 8 -------- trunk/include/linux/kernel.h | 2 +- trunk/kernel/panic.c | 1 - 4 files changed, 2 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 606f2d424f77..b15e42a8f37b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ba6edfcd1708da2e665f14eee76e87f39448ec40 +refs/heads/master: aa7271076ae6547d7f370ad7e91ef86fdb318f17 diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt index 59d0c74c79c9..293fed113dff 100644 --- a/trunk/Documentation/feature-removal-schedule.txt +++ b/trunk/Documentation/feature-removal-schedule.txt @@ -71,14 +71,6 @@ Who: Mauro Carvalho Chehab --------------------------- -What: remove EXPORT_SYMBOL(panic_timeout) -When: April 2006 -Files: kernel/panic.c -Why: No modular usage in the kernel. -Who: Adrian Bunk - ---------------------------- - What: remove EXPORT_SYMBOL(insert_resource) When: April 2006 Files: kernel/resource.c diff --git a/trunk/include/linux/kernel.h b/trunk/include/linux/kernel.h index a3720f973ea5..e1bd0842f6a1 100644 --- a/trunk/include/linux/kernel.h +++ b/trunk/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/trunk/kernel/panic.c b/trunk/kernel/panic.c index f895c7c01d5b..cc2a4c9c36ac 100644 --- a/trunk/kernel/panic.c +++ b/trunk/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);