Skip to contentSkip to conversation

panic_timeout: move to kernel.h

PATCH New Randy.Dunlap 1 participant 1 message Dec 1, 2004

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 panic_timeout: move to kernel.h

Move 'panic_timeout' to linux/kernel.h.

ipmi_watchdog.c wanted to know why panic_timeout isn't in some header file. However, ipmi_watchdog.c doesn't even use it, so that reference was deleted. Other references now use kernel.h instead of straight extern int.

diffstat:=

 arch/mips/ddb5xxx/ddb5074/setup.c   |    2 --
 arch/mips/ddb5xxx/ddb5476/setup.c   |    2 --
 arch/mips/ddb5xxx/ddb5477/setup.c   |    2 --
 arch/mips/jmr3927/rbhma3100/setup.c |    1 -
 arch/mips/sibyte/swarm/setup.c      |    3 +--
 arch/ppc/kernel/setup.c             |    2 +-
 arch/ppc64/kernel/iSeries_pci.c     |    2 --
 arch/ppc64/kernel/setup.c           |    2 +-
 arch/v850/kernel/fpga85e2c.c        |    1 -
 arch/v850/kernel/sim85e2.c          |    2 --
 drivers/char/ipmi/ipmi_watchdog.c   |    2 --
 include/linux/kernel.h              |    1 +
 kernel/sysctl.c                     |    1 -
 13 files changed, 4 insertions(+), 19 deletions(-)
drivers/char/ipmi/ipmi_watchdog.c renamed from drivers/char/ipmi/ipmi_watchdog.c~panic_header +0 -2
diff -Naurp ./drivers/char/ipmi/ipmi_watchdog.c~panic_header ./drivers/char/ipmi/ipmi_watchdog.c
@@ -890,8 +890,6 @@ static struct notifier_block wdog_reboot
 	0
 };
 
-extern int panic_timeout; /* Why isn't this defined anywhere? */
-
 static int wdog_panic_handler(struct notifier_block *this,
 			      unsigned long         event,
 			      void                  *unused)
arch/ppc/kernel/setup.c renamed from arch/ppc/kernel/setup.c~panic_header +1 -1
diff -Naurp ./arch/ppc/kernel/setup.c~panic_header ./arch/ppc/kernel/setup.c
@@ -7,6 +7,7 @@
 #include <linux/string.h>
 #include <linux/sched.h>
 #include <linux/init.h>
+#include <linux/kernel.h>
 #include <linux/reboot.h>
 #include <linux/delay.h>
 #include <linux/initrd.h>
@@ -681,7 +682,6 @@ arch_initcall(ppc_init);
 /* Warning, IO base is not yet inited */
 void __init setup_arch(char **cmdline_p)
 {
-	extern int panic_timeout;
 	extern char *klimit;
 	extern void do_init_bootmem(void);
 
arch/mips/jmr3927/rbhma3100/setup.c renamed from arch/mips/jmr3927/rbhma3100/setup.c~panic_header +0 -1
diff -Naurp ./arch/mips/jmr3927/rbhma3100/setup.c~panic_header ./arch/mips/jmr3927/rbhma3100/setup.c
@@ -200,7 +200,6 @@ extern struct resource pci_mem_resource;
 
 static void __init jmr3927_setup(void)
 {
-	extern int panic_timeout;
 	char *argptr;
 
 	irq_setup = jmr3927_irq_setup;
arch/mips/ddb5xxx/ddb5477/setup.c renamed from arch/mips/ddb5xxx/ddb5477/setup.c~panic_header +0 -2
diff -Naurp ./arch/mips/ddb5xxx/ddb5477/setup.c~panic_header ./arch/mips/ddb5xxx/ddb5477/setup.c
@@ -173,8 +173,6 @@ extern struct pci_controller ddb5477_io_
 
 static int  ddb5477_setup(void)
 {
-	extern int panic_timeout;
-
 	/* initialize board - we don't trust the loader */
         ddb5477_board_init();
 
arch/mips/ddb5xxx/ddb5074/setup.c renamed from arch/mips/ddb5xxx/ddb5074/setup.c~panic_header +0 -2
diff -Naurp ./arch/mips/ddb5xxx/ddb5074/setup.c~panic_header ./arch/mips/ddb5xxx/ddb5074/setup.c
@@ -94,8 +94,6 @@ static void __init ddb_time_init(void)
 
 static void __init ddb5074_setup(void)
 {
-	extern int panic_timeout;
-
 	irq_setup = ddb_irq_setup;
 	set_io_port_base(NILE4_PCI_IO_BASE);
 	isa_slot_offset = NILE4_PCI_MEM_BASE;
arch/mips/ddb5xxx/ddb5476/setup.c renamed from arch/mips/ddb5xxx/ddb5476/setup.c~panic_header +0 -2
diff -Naurp ./arch/mips/ddb5xxx/ddb5476/setup.c~panic_header ./arch/mips/ddb5xxx/ddb5476/setup.c
@@ -134,8 +134,6 @@ extern void (*irq_setup)(void);
 
 static void __init ddb5476_setup(void)
 {
-	extern int panic_timeout;
-
 	irq_setup = ddb5476_irq_setup;
 	set_io_port_base(KSEG1ADDR(DDB_PCI_IO_BASE));
 
arch/mips/sibyte/swarm/setup.c renamed from arch/mips/sibyte/swarm/setup.c~panic_header +1 -2
diff -Naurp ./arch/mips/sibyte/swarm/setup.c~panic_header ./arch/mips/sibyte/swarm/setup.c
@@ -26,6 +26,7 @@
 #include <linux/bootmem.h>
 #include <linux/blkdev.h>
 #include <linux/init.h>
+#include <linux/kernel.h>
 
 #include <asm/irq.h>
 #include <asm/io.h>
@@ -83,8 +84,6 @@ int swarm_be_handler(struct pt_regs *reg
 
 static int __init swarm_setup(void)
 {
-	extern int panic_timeout;
-
 	sb1250_setup();
 
 	panic_timeout = 5;  /* For debug.  */
arch/ppc64/kernel/setup.c renamed from arch/ppc64/kernel/setup.c~panic_header +1 -1
diff -Naurp ./arch/ppc64/kernel/setup.c~panic_header ./arch/ppc64/kernel/setup.c
@@ -17,6 +17,7 @@
 #include <linux/string.h>
 #include <linux/sched.h>
 #include <linux/init.h>
+#include <linux/kernel.h>
 #include <linux/reboot.h>
 #include <linux/delay.h>
 #include <linux/initrd.h>
@@ -988,7 +989,6 @@ static void __init emergency_stack_init(
  */
 void __init setup_arch(char **cmdline_p)
 {
-	extern int panic_timeout;
 	extern void do_init_bootmem(void);
 
 	ppc64_boot_msg(0x12, "Setup Arch");
arch/ppc64/kernel/iSeries_pci.c renamed from arch/ppc64/kernel/iSeries_pci.c~panic_header +0 -2
diff -Naurp ./arch/ppc64/kernel/iSeries_pci.c~panic_header ./arch/ppc64/kernel/iSeries_pci.c
@@ -48,8 +48,6 @@
 
 #include "pci.h"
 
-extern int panic_timeout;
-
 extern unsigned long io_page_mask;
 
 /*
arch/v850/kernel/sim85e2.c renamed from arch/v850/kernel/sim85e2.c~panic_header +0 -2
diff -Naurp ./arch/v850/kernel/sim85e2.c~panic_header ./arch/v850/kernel/sim85e2.c
@@ -65,8 +65,6 @@ extern void memcons_setup (void);
 
 void EARLY_INIT_SECTION_ATTR mach_early_init (void)
 {
-	extern int panic_timeout;
-
 	/* The sim85e2 simulator tracks `undefined' values, so to make
 	   debugging easier, we begin by zeroing out all otherwise
 	   undefined registers.  This is not strictly necessary.
arch/v850/kernel/fpga85e2c.c renamed from arch/v850/kernel/fpga85e2c.c~panic_header +0 -1
diff -Naurp ./arch/v850/kernel/fpga85e2c.c~panic_header ./arch/v850/kernel/fpga85e2c.c
@@ -42,7 +42,6 @@ void __init mach_early_init (void)
 	int i;
 	const u32 *src;
 	register u32 *dst asm ("ep");
-	extern int panic_timeout;
 	extern u32 _intv_end, _intv_load_start;
 
 	/* Set bus sizes: CS0 32-bit, CS1 16-bit, CS7 8-bit,
include/linux/kernel.h renamed from include/linux/kernel.h~panic_header +1 -0
diff -Naurp ./include/linux/kernel.h~panic_header ./include/linux/kernel.h
@@ -134,6 +134,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 int panic_timeout;
 extern int panic_on_oops;
 extern int tainted;
 extern const char *print_tainted(void);
kernel/sysctl.c renamed from kernel/sysctl.c~panic_header +0 -1
diff -Naurp ./kernel/sysctl.c~panic_header ./kernel/sysctl.c
@@ -52,7 +52,6 @@
 #if defined(CONFIG_SYSCTL)
 
 /* External variables not in a header file. */
-extern int panic_timeout;
 extern int C_A_D;
 extern int sysctl_overcommit_memory;
 extern int sysctl_overcommit_ratio;

---