diff options
author | Adrian Bunk <bunk@kernel.org> | 2008-01-30 07:30:31 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:30:31 -0500 |
commit | 867ab545668385b903f9379019000383675c49b3 (patch) | |
tree | e1c9a76acfa9bccd81d0800ee917b99c1c9939e5 | |
parent | 231fd906c5e71219bbc32618a8ed8b439d5dde98 (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.c | 4 | ||||
-rw-r--r-- | include/asm-x86/nmi_64.h | 2 |
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 | */ |
41 | atomic_t nmi_active = ATOMIC_INIT(0); /* oprofile uses this */ | 41 | atomic_t nmi_active = ATOMIC_INIT(0); /* oprofile uses this */ |
42 | int panic_on_timeout; | 42 | static int panic_on_timeout; |
43 | 43 | ||
44 | unsigned int nmi_watchdog = NMI_DEFAULT; | 44 | unsigned int nmi_watchdog = NMI_DEFAULT; |
45 | static unsigned int nmi_hz = HZ; | 45 | static 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 | ||
139 | int __init setup_nmi_watchdog(char *str) | 139 | static 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 | ||
41 | extern int panic_on_timeout; | ||
42 | extern int unknown_nmi_panic; | 41 | extern int unknown_nmi_panic; |
43 | extern int nmi_watchdog_enabled; | 42 | extern int nmi_watchdog_enabled; |
44 | 43 | ||
@@ -57,7 +56,6 @@ extern void enable_timer_nmi_watchdog(void); | |||
57 | extern int nmi_watchdog_tick (struct pt_regs * regs, unsigned reason); | 56 | extern int nmi_watchdog_tick (struct pt_regs * regs, unsigned reason); |
58 | 57 | ||
59 | extern void nmi_watchdog_default(void); | 58 | extern void nmi_watchdog_default(void); |
60 | extern int setup_nmi_watchdog(char *); | ||
61 | 59 | ||
62 | extern atomic_t nmi_active; | 60 | extern atomic_t nmi_active; |
63 | extern unsigned int nmi_watchdog; | 61 | extern unsigned int nmi_watchdog; |