Re: [2.6 patch] i386: KEXEC must depend on (!SMP && X86_LOCAL_APIC)

[Eric W. Biederman]

Adrian Bunk <bunk@xxxxxxxxx> writes:
> This patch fixes the following issue with CONFIG_SMP=y and 
> CONFIG_X86_VOYAGER=y:
>
> <--  snip  -->
>
> ...
>   CC      arch/i386/kernel/crash.o
> arch/i386/kernel/crash.c: In function âcrash_nmi_callbackâ:
> arch/i386/kernel/crash.c:113: error: implicit declaration of function
> âdisable_local_APICâ
>
> <--  snip  -->

I think the patch below more correctly captures the dependency.

In truth that call to disable_local_APIC() is a bug but the kernel
isn't ready yet to boot in apic only mode, so it remains until
the apic initialization can be moved into init_IRQ.

Does this sound good?

Eric


diff --git a/arch/i386/kernel/crash.c b/arch/i386/kernel/crash.c
index 48f0f62..5b96f03 100644
--- a/arch/i386/kernel/crash.c
+++ b/arch/i386/kernel/crash.c
@@ -90,7 +90,7 @@ static void crash_save_self(struct pt_re
        crash_save_this_cpu(regs, cpu);
 }
 
-#ifdef CONFIG_SMP
+#if defined(CONFIG_SMP) && defined(CONFIG_X86_LOCAL_APIC)
 static atomic_t waiting_for_crash_ipi;
 
 static int crash_nmi_callback(struct pt_regs *regs, int cpu)

-
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/