Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 867ab545 authored Jan 30, 2008 by Adrian Bunk Committed by Ingo Molnar Jan 30, 2008

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>

parent 231fd906

arch/x86/kernel/nmi_64.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -39,7 +39,7 @@ static cpumask_t backtrace_mask = CPU_MASK_NONE;
	* 0: the lapic NMI watchdog is disabled, but can be enabled		* 0: the lapic NMI watchdog is disabled, but can be enabled
	*/		*/
	atomic_t nmi_active = ATOMIC_INIT(0); /* oprofile uses this */		atomic_t nmi_active = ATOMIC_INIT(0); /* oprofile uses this */
	int panic_on_timeout;		static int panic_on_timeout;

	unsigned int nmi_watchdog = NMI_DEFAULT;		unsigned int nmi_watchdog = NMI_DEFAULT;
	static unsigned int nmi_hz = HZ;		static unsigned int nmi_hz = HZ;
	@@ -136,7 +136,7 @@ int __init check_nmi_watchdog (void)
	return 0;		return 0;
	}		}

	int __init setup_nmi_watchdog(char *str)		static int __init setup_nmi_watchdog(char *str)
	{		{
	int nmi;		int nmi;

include/asm-x86/nmi_64.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -38,7 +38,6 @@ extern void die_nmi(char str, struct pt_regs regs, int do_panic);

	#define get_nmi_reason() inb(0x61)		#define get_nmi_reason() inb(0x61)

	extern int panic_on_timeout;
	extern int unknown_nmi_panic;		extern int unknown_nmi_panic;
	extern int nmi_watchdog_enabled;		extern int nmi_watchdog_enabled;

	@@ -57,7 +56,6 @@ extern void enable_timer_nmi_watchdog(void);
	extern int nmi_watchdog_tick (struct pt_regs * regs, unsigned reason);		extern int nmi_watchdog_tick (struct pt_regs * regs, unsigned reason);

	extern void nmi_watchdog_default(void);		extern void nmi_watchdog_default(void);
	extern int setup_nmi_watchdog(char *);

	extern atomic_t nmi_active;		extern atomic_t nmi_active;
	extern unsigned int nmi_watchdog;		extern unsigned int nmi_watchdog;