From 3462faaf691e4e5cc132e22ada26a4bf9832a148 Mon Sep 17 00:00:00 2001 From: Mike Travis Date: Mon, 12 May 2008 21:21:12 +0200 Subject: [PATCH] --- yaml --- r: 99783 b: refs/heads/master c: 7496b60654e759d0b9008b80908e80727904b3c4 h: refs/heads/master i: 99781: 5444678c3818ec1d09b95fada92b4024b8e48c49 99779: c19d087bece6d71d2dab2b7d4fdce2f5520714fa 99775: 8526bb5be9aa32da2672f24843a12776957ed898 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/nmi_64.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5b189758fa52..2c156ec3ebaa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dbb6152e6f72df367f8a955586c5e6282a7255e5 +refs/heads/master: 7496b60654e759d0b9008b80908e80727904b3c4 diff --git a/trunk/arch/x86/kernel/nmi_64.c b/trunk/arch/x86/kernel/nmi_64.c index 5a29ded994fa..2861b9408ac9 100644 --- a/trunk/arch/x86/kernel/nmi_64.c +++ b/trunk/arch/x86/kernel/nmi_64.c @@ -88,7 +88,7 @@ int __init check_nmi_watchdog(void) if (!atomic_read(&nmi_active)) return 0; - prev_nmi_count = kmalloc(NR_CPUS * sizeof(int), GFP_KERNEL); + prev_nmi_count = kmalloc(nr_cpu_ids * sizeof(int), GFP_KERNEL); if (!prev_nmi_count) return -1; @@ -99,7 +99,7 @@ int __init check_nmi_watchdog(void) smp_call_function(nmi_cpu_busy, (void *)&endflag, 0, 0); #endif - for (cpu = 0; cpu < NR_CPUS; cpu++) + for (cpu = 0; cpu < nr_cpu_ids; cpu++) prev_nmi_count[cpu] = cpu_pda(cpu)->__nmi_count; local_irq_enable(); mdelay((20*1000)/nmi_hz); // wait 20 ticks