aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2008-01-30 07:30:31 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:30:31 -0500
commit867ab545668385b903f9379019000383675c49b3 (patch)
treee1c9a76acfa9bccd81d0800ee917b99c1c9939e5
parent231fd906c5e71219bbc32618a8ed8b439d5dde98 (diff)
x86: nmi_64.c: make code static
This patch makes the following needlessly global code static: - panic_on_timeout - setup_nmi_watchdog() Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--arch/x86/kernel/nmi_64.c4
-rw-r--r--include/asm-x86/nmi_64.h2
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/kernel/nmi_64.c b/arch/x86/kernel/nmi_64.c
index c3d1476b6a11..53faef632fc6 100644
--- a/arch/x86/kernel/nmi_64.c
+++ b/arch/x86/kernel/nmi_64.c
@@ -39,7 +39,7 @@ static cpumask_t backtrace_mask = CPU_MASK_NONE;
39 * 0: the lapic NMI watchdog is disabled, but can be enabled 39 * 0: the lapic NMI watchdog is disabled, but can be enabled
40 */ 40 */
41atomic_t nmi_active = ATOMIC_INIT(0); /* oprofile uses this */ 41atomic_t nmi_active = ATOMIC_INIT(0); /* oprofile uses this */
42int panic_on_timeout; 42static int panic_on_timeout;
43 43
44unsigned int nmi_watchdog = NMI_DEFAULT; 44unsigned int nmi_watchdog = NMI_DEFAULT;
45static unsigned int nmi_hz = HZ; 45static unsigned int nmi_hz = HZ;
@@ -136,7 +136,7 @@ int __init check_nmi_watchdog (void)
136 return 0; 136 return 0;
137} 137}
138 138
139int __init setup_nmi_watchdog(char *str) 139static int __init setup_nmi_watchdog(char *str)
140{ 140{
141 int nmi; 141 int nmi;
142 142
diff --git a/include/asm-x86/nmi_64.h b/include/asm-x86/nmi_64.h
index 92f36fb1dc62..2eeb74e5f3ff 100644
--- a/include/asm-x86/nmi_64.h
+++ b/include/asm-x86/nmi_64.h
@@ -38,7 +38,6 @@ extern void die_nmi(char *str, struct pt_regs *regs, int do_panic);
38 38
39#define get_nmi_reason() inb(0x61) 39#define get_nmi_reason() inb(0x61)
40 40
41extern int panic_on_timeout;
42extern int unknown_nmi_panic; 41extern int unknown_nmi_panic;
43extern int nmi_watchdog_enabled; 42extern int nmi_watchdog_enabled;
44 43
@@ -57,7 +56,6 @@ extern void enable_timer_nmi_watchdog(void);
57extern int nmi_watchdog_tick (struct pt_regs * regs, unsigned reason); 56extern int nmi_watchdog_tick (struct pt_regs * regs, unsigned reason);
58 57
59extern void nmi_watchdog_default(void); 58extern void nmi_watchdog_default(void);
60extern int setup_nmi_watchdog(char *);
61 59
62extern atomic_t nmi_active; 60extern atomic_t nmi_active;
63extern unsigned int nmi_watchdog; 61extern unsigned int nmi_watchdog;