aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2005-11-07 04:01:44 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 10:54:08 -0500
commitdfed04492f2459e47dcb290be6ed5a8bc37096d5 (patch)
tree10b2b90d2fd270d86f381a06e535736ea7c16792
parent24622efd11fc5ee569b008b9f89e5e268265811b (diff)
[PATCH] __deprecated_for_modules: panic_timeout
This looks like something which out-of-tree code could possibly be using. Give panic_timeout the twelve-month treatment. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--Documentation/feature-removal-schedule.txt8
-rw-r--r--include/linux/kernel.h2
2 files changed, 9 insertions, 1 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 7fd8c80fa0fc..decdf9917e0d 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -69,6 +69,14 @@ Who: Grant Coady <gcoady@gmail.com>
69 69
70--------------------------- 70---------------------------
71 71
72What: remove EXPORT_SYMBOL(panic_timeout)
73When: April 2006
74Files: kernel/panic.c
75Why: No modular usage in the kernel.
76Who: Adrian Bunk <bunk@stusta.de>
77
78---------------------------
79
72What: remove EXPORT_SYMBOL(insert_resource) 80What: remove EXPORT_SYMBOL(insert_resource)
73When: April 2006 81When: April 2006
74Files: kernel/resource.c 82Files: kernel/resource.c
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index b6419489b27b..b1e407a4fbda 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -168,7 +168,7 @@ static inline void console_verbose(void)
168 168
169extern void bust_spinlocks(int yes); 169extern void bust_spinlocks(int yes);
170extern int oops_in_progress; /* If set, an oops, panic(), BUG() or die() is in progress */ 170extern int oops_in_progress; /* If set, an oops, panic(), BUG() or die() is in progress */
171extern int panic_timeout; 171extern __deprecated_for_modules int panic_timeout;
172extern int panic_on_oops; 172extern int panic_on_oops;
173extern int tainted; 173extern int tainted;
174extern const char *print_tainted(void); 174extern const char *print_tainted(void);