Re: 2.6.11-rc1-mm2: CONFIG_SMP=n compile error

From: Rafael J. Wysocki
Date: Thu Jan 20 2005 - 12:49:01 EST


On Thursday, 20 of January 2005 08:12, Andrew Morton wrote:
> Adrian Bunk <bunk@xxxxxxxxx> wrote:
> >
> > arch/i386/kernel/nmi.c:130: error: `cpu_callin_map' undeclared (first use in this function)
>
> --- 25/arch/i386/kernel/nmi.c~i386-x86-64-fix-smp-nmi-watchdog-race-fix 2005-01-19 23:03:08.946815320 -0800
> +++ 25-akpm/arch/i386/kernel/nmi.c 2005-01-19 23:05:07.968721240 -0800
> @@ -117,8 +117,10 @@ int __init check_nmi_watchdog (void)
> /* FIXME: Only boot CPU is online at this stage. Check CPUs
> as they come up. */
> for (cpu = 0; cpu < NR_CPUS; cpu++) {
> +#ifdef CONFIG_SMP
> if (!cpu_isset(cpu, cpu_callin_map))
> continue;
> +#endif
> if (nmi_count(cpu) - prev_nmi_count[cpu] <= 5) {
> printk("CPU#%d: NMI appears to be stuck!\n", cpu);
> nmi_active = 0;
> diff -puN include/asm-i386/smp.h~i386-x86-64-fix-smp-nmi-watchdog-race-fix include/asm-i386/smp.h

Similar fix is necessary for x86-64, it appears.

Greets,
RJW


--
- Would you tell me, please, which way I ought to go from here?
- That depends a good deal on where you want to get to.
-- Lewis Carroll "Alice's Adventures in Wonderland"
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/