aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/nmi_32.c
diff options
context:
space:
mode:
authorGlauber de Oliveira Costa <gcosta@redhat.com>2008-03-19 13:25:36 -0400
committerIngo Molnar <mingo@elte.hu>2008-04-17 11:41:01 -0400
commit6d60cd5359e261cad1e519e77ca733c05c2f8025 (patch)
tree9b5e05b78bca00c7e55a997877d3e341fce5ddab /arch/x86/kernel/nmi_32.c
parente32ede19ac64b5cd896e6d28aa51d34887791ab2 (diff)
x86: unify nmi_32.h and nmi_64.h
Two more files goes away. nmi_64.h and nmi_32.h gives birth to nmi.h Signed-off-by: Glauber Costa <gcosta@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/nmi_32.c')
-rw-r--r--arch/x86/kernel/nmi_32.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/nmi_32.c b/arch/x86/kernel/nmi_32.c
index 6a0aa7038685..167385155765 100644
--- a/arch/x86/kernel/nmi_32.c
+++ b/arch/x86/kernel/nmi_32.c
@@ -67,7 +67,7 @@ static __init void nmi_cpu_busy(void *data)
67} 67}
68#endif 68#endif
69 69
70static int __init check_nmi_watchdog(void) 70int __init check_nmi_watchdog(void)
71{ 71{
72 unsigned int *prev_nmi_count; 72 unsigned int *prev_nmi_count;
73 int cpu; 73 int cpu;