aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/nmi_64.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/nmi_64.c b/arch/x86/kernel/nmi_64.c
index 5a29ded994fa..2861b9408ac9 100644
--- a/arch/x86/kernel/nmi_64.c
+++ b/arch/x86/kernel/nmi_64.c
@@ -88,7 +88,7 @@ int __init check_nmi_watchdog(void)
88 if (!atomic_read(&nmi_active)) 88 if (!atomic_read(&nmi_active))
89 return 0; 89 return 0;
90 90
91 prev_nmi_count = kmalloc(NR_CPUS * sizeof(int), GFP_KERNEL); 91 prev_nmi_count = kmalloc(nr_cpu_ids * sizeof(int), GFP_KERNEL);
92 if (!prev_nmi_count) 92 if (!prev_nmi_count)
93 return -1; 93 return -1;
94 94
@@ -99,7 +99,7 @@ int __init check_nmi_watchdog(void)
99 smp_call_function(nmi_cpu_busy, (void *)&endflag, 0, 0); 99 smp_call_function(nmi_cpu_busy, (void *)&endflag, 0, 0);
100#endif 100#endif
101 101
102 for (cpu = 0; cpu < NR_CPUS; cpu++) 102 for (cpu = 0; cpu < nr_cpu_ids; cpu++)
103 prev_nmi_count[cpu] = cpu_pda(cpu)->__nmi_count; 103 prev_nmi_count[cpu] = cpu_pda(cpu)->__nmi_count;
104 local_irq_enable(); 104 local_irq_enable();
105 mdelay((20*1000)/nmi_hz); // wait 20 ticks 105 mdelay((20*1000)/nmi_hz); // wait 20 ticks