diff options
Diffstat (limited to 'arch/x86/kernel/nmi_64.c')
-rw-r--r-- | arch/x86/kernel/nmi_64.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/nmi_64.c b/arch/x86/kernel/nmi_64.c index 0060e44e8989..d62f3b66b529 100644 --- a/arch/x86/kernel/nmi_64.c +++ b/arch/x86/kernel/nmi_64.c | |||
@@ -90,7 +90,7 @@ int __init check_nmi_watchdog(void) | |||
90 | if (!atomic_read(&nmi_active)) | 90 | if (!atomic_read(&nmi_active)) |
91 | return 0; | 91 | return 0; |
92 | 92 | ||
93 | prev_nmi_count = kmalloc(NR_CPUS * sizeof(int), GFP_KERNEL); | 93 | prev_nmi_count = kmalloc(nr_cpu_ids * sizeof(int), GFP_KERNEL); |
94 | if (!prev_nmi_count) | 94 | if (!prev_nmi_count) |
95 | goto error; | 95 | goto error; |
96 | 96 | ||
@@ -101,7 +101,7 @@ int __init check_nmi_watchdog(void) | |||
101 | smp_call_function(nmi_cpu_busy, (void *)&endflag, 0, 0); | 101 | smp_call_function(nmi_cpu_busy, (void *)&endflag, 0, 0); |
102 | #endif | 102 | #endif |
103 | 103 | ||
104 | for (cpu = 0; cpu < NR_CPUS; cpu++) | 104 | for (cpu = 0; cpu < nr_cpu_ids; cpu++) |
105 | prev_nmi_count[cpu] = cpu_pda(cpu)->__nmi_count; | 105 | prev_nmi_count[cpu] = cpu_pda(cpu)->__nmi_count; |
106 | local_irq_enable(); | 106 | local_irq_enable(); |
107 | mdelay((20*1000)/nmi_hz); // wait 20 ticks | 107 | mdelay((20*1000)/nmi_hz); // wait 20 ticks |