From: Ingo Molnar <mingo@elte.hu>
To: Henrik Kretzschmar <henne@nachtwindheim.de>
Cc: mingo@readhat.com, tglx@linutronix.de, hpa@zytor.com,
x86@kernel.org, tj@kernel.org, yinghai@kernel.org,
ak@linux.intel.com, robert.richter@amd.com,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 5/6] x86: ifdef ioapic related function out
Date: Mon, 14 Feb 2011 12:00:39 +0100 [thread overview]
Message-ID: <20110214110039.GA7140@elte.hu> (raw)
In-Reply-To: <1297677612-12405-5-git-send-email-henne@nachtwindheim.de>
* Henrik Kretzschmar <henne@nachtwindheim.de> 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@nachtwindheim.de>
> ---
> 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
next prev parent reply other threads:[~2011-02-14 11:00 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-14 10:00 [PATCH 1/6] x86: move ioapic_irq_destination_types Henrik Kretzschmar
2011-02-14 10:00 ` [PATCH 2/6] x86: ifdef enable_IR_x2apic() out Henrik Kretzschmar
2011-02-14 11:03 ` Ingo Molnar
2011-02-15 13:47 ` Henrik Kretzschmar
2011-02-15 14:13 ` Gleb Natapov
2011-02-14 10:00 ` [PATCH 3/6] x86: ifdef INTR_REMAP code out Henrik Kretzschmar
2011-02-14 11:02 ` Ingo Molnar
2011-02-14 10:00 ` [PATCH 4/6] x86: add dummy mp_save_irq() Henrik Kretzschmar
2011-02-14 10:00 ` [PATCH 5/6] x86: ifdef ioapic related function out Henrik Kretzschmar
2011-02-14 11:00 ` Ingo Molnar [this message]
2011-02-14 10:00 ` [PATCH 6/6] x86: makes X86_UP_IOAPIC work again Henrik Kretzschmar
2011-02-14 11:05 ` [PATCH 1/6] x86: move ioapic_irq_destination_types Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110214110039.GA7140@elte.hu \
--to=mingo@elte.hu \
--cc=ak@linux.intel.com \
--cc=henne@nachtwindheim.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@readhat.com \
--cc=robert.richter@amd.com \
--cc=tglx@linutronix.de \
--cc=tj@kernel.org \
--cc=x86@kernel.org \
--cc=yinghai@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®