Re: [PATCH 5/6] x86: ifdef ioapic related function out

From: Ingo Molnar
Date: Mon Feb 14 2011 - 06:00:59 EST



* Henrik Kretzschmar <henne@xxxxxxxxxxxxxxxx> wrote:

> arch_disable_smp_config() is an IO-APIC related function on x86,
> and should only be needed if SMP is enabled.
> But the IO-APIC code calls it when the parameter "noapic" is given to
> the kernel, which doesn't mean SMP is enabled.
>
> Anyway this fixes compilation on x86_32 UP systems with APIC and no IO-APIC.
>
> Signed-off-by: Henrik Kretzschmar <henne@xxxxxxxxxxxxxxxx>
> ---
> arch/x86/kernel/apic/apic.c | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
> index 999c531..4998f0a 100644
> --- a/arch/x86/kernel/apic/apic.c
> +++ b/arch/x86/kernel/apic/apic.c
> @@ -1218,7 +1218,9 @@ void __cpuinit setup_local_APIC(void)
> rdtscll(tsc);
>
> if (disable_apic) {
> +#ifdef CONFIG_X86_IO_APIC
> arch_disable_smp_support();
> +#endif

Why not make the arch_disable_smp_support() call generic in the
arch/x86/include/asm/smp.h file (via an inline helper) and thus
avoid an ugly #ifdef in the .c file?

Thanks,

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