Commit 4ffd90a1 authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds

[PATCH] 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.
Signed-off-by: default avatarRandy Dunlap <rddunlap@osdl.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e9855e2c
......@@ -88,8 +88,6 @@ static void __init ddb_time_init(void)
static void __init ddb5074_setup(void)
{
extern int panic_timeout;
set_io_port_base(NILE4_PCI_IO_BASE);
isa_slot_offset = NILE4_PCI_MEM_BASE;
board_timer_setup = ddb_timer_init;
......
......@@ -127,8 +127,6 @@ static void ddb5476_board_init(void);
static void __init ddb5476_setup(void)
{
extern int panic_timeout;
set_io_port_base(KSEG1ADDR(DDB_PCI_IO_BASE));
board_time_init = ddb_time_init;
......
......@@ -172,8 +172,6 @@ extern struct pci_controller ddb5477_io_controller;
static int ddb5477_setup(void)
{
extern int panic_timeout;
/* initialize board - we don't trust the loader */
ddb5477_board_init();
......
......@@ -195,7 +195,6 @@ extern struct resource pci_mem_resource;
static void __init jmr3927_setup(void)
{
extern int panic_timeout;
char *argptr;
set_io_port_base(JMR3927_PORT_BASE + JMR3927_PCIIO);
......
......@@ -27,6 +27,7 @@
#include <linux/bootmem.h>
#include <linux/blkdev.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/tty.h>
#include <linux/initrd.h>
......@@ -85,8 +86,6 @@ int swarm_be_handler(struct pt_regs *regs, int is_fixup)
static int __init swarm_setup(void)
{
extern int panic_timeout;
sb1250_setup();
panic_timeout = 5; /* For debug. */
......
......@@ -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);
......
......@@ -47,8 +47,6 @@
#include "pci.h"
extern int panic_timeout;
extern unsigned long io_page_mask;
/*
......
......@@ -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>
......@@ -994,7 +995,6 @@ static void __init emergency_stack_init(void)
*/
void __init setup_arch(char **cmdline_p)
{
extern int panic_timeout;
extern void do_init_bootmem(void);
ppc64_boot_msg(0x12, "Setup Arch");
......
......@@ -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,
......
......@@ -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.
......
......@@ -876,8 +876,6 @@ static struct notifier_block wdog_reboot_notifier = {
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)
......
......@@ -136,6 +136,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);
......
......@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment