mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-11-23 03:18:08 +01:00
89 lines
3.5 KiB
Text
89 lines
3.5 KiB
Text
|
From: Ingo Molnar <mingo@elte.hu>
|
||
|
|
Subject: Re: [PATCH 5/6] x86: ifdef ioapic related function out
|
||
|
|
Date: Mon, 14 Feb 2011 12:00:39 +0100
|
||
|
|
Lines: 34
|
||
|
|
Message-ID: <20110214110039.GA7140@elte.hu>
|
||
|
|
References: <1297677612-12405-1-git-send-email-henne@nachtwindheim.de>
|
||
|
|
<1297677612-12405-5-git-send-email-henne@nachtwindheim.de>
|
||
|
|
Mime-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=us-ascii
|
||
|
|
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
|
||
|
|
To: Henrik Kretzschmar <henne@nachtwindheim.de>
|
||
|
|
X-From: linux-kernel-owner@vger.kernel.org Mon Feb 14 12:01:04 2011
|
||
|
|
Return-path: <linux-kernel-owner@vger.kernel.org>
|
||
|
|
Envelope-to: glk-linux-kernel-3@lo.gmane.org
|
||
|
|
Received: from vger.kernel.org ([209.132.180.67])
|
||
|
|
by lo.gmane.org with esmtp (Exim 4.69)
|
||
|
|
(envelope-from <linux-kernel-owner@vger.kernel.org>)
|
||
|
|
id 1PowAx-0001Lu-Lk
|
||
|
|
for glk-linux-kernel-3@lo.gmane.org; Mon, 14 Feb 2011 12:01:04 +0100
|
||
|
|
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
|
||
|
|
id S1752962Ab1BNLA5 (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>);
|
||
|
|
Mon, 14 Feb 2011 06:00:57 -0500
|
||
|
|
Received: from mx3.mail.elte.hu ([157.181.1.138]:38470 "EHLO mx3.mail.elte.hu"
|
||
|
|
rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
|
||
|
|
id S1752556Ab1BNLAz (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
|
||
|
|
Mon, 14 Feb 2011 06:00:55 -0500
|
||
|
|
Received: from elvis.elte.hu ([157.181.1.14])
|
||
|
|
by mx3.mail.elte.hu with esmtp (Exim)
|
||
|
|
id 1PowAd-0003Lr-F7
|
||
|
|
from <mingo@elte.hu>; Mon, 14 Feb 2011 12:00:48 +0100
|
||
|
|
Received: by elvis.elte.hu (Postfix, from userid 1004)
|
||
|
|
id 7726F3E236B; Mon, 14 Feb 2011 12:00:41 +0100 (CET)
|
||
|
|
Content-Disposition: inline
|
||
|
|
In-Reply-To: <1297677612-12405-5-git-send-email-henne@nachtwindheim.de>
|
||
|
|
User-Agent: Mutt/1.5.20 (2009-08-17)
|
||
|
|
Received-SPF: neutral (mx3: 157.181.1.14 is neither permitted nor denied by domain of elte.hu) client-ip=157.181.1.14; envelope-from=mingo@elte.hu; helo=elvis.elte.hu;
|
||
|
|
X-ELTE-SpamScore: -2.0
|
||
|
|
X-ELTE-SpamLevel:
|
||
|
|
X-ELTE-SpamCheck: no
|
||
|
|
X-ELTE-SpamVersion: ELTE 2.0
|
||
|
|
X-ELTE-SpamCheck-Details: score=-2.0 required=5.9 tests=BAYES_00 autolearn=no SpamAssassin version=3.2.5
|
||
|
|
-2.0 BAYES_00 BODY: Bayesian spam probability is 0 to 1%
|
||
|
|
[score: 0.0000]
|
||
|
|
Sender: linux-kernel-owner@vger.kernel.org
|
||
|
|
Precedence: bulk
|
||
|
|
List-ID: <linux-kernel.vger.kernel.org>
|
||
|
|
X-Mailing-List: linux-kernel@vger.kernel.org
|
||
|
|
Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1099670>
|
||
|
|
|
||
|
|
|
||
|
|
* 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
|
||
|
|
|
||
|
|
|