[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <alpine.DEB.2.00.1012171253520.30929@chino.kir.corp.google.com>
Date: Fri, 17 Dec 2010 12:56:41 -0800 (PST)
From: David Rientjes <rientjes@...gle.com>
To: Yinghai Lu <yinghai@...nel.org>
cc: "H. Peter Anvin" <hpa@...or.com>, Ingo Molnar <mingo@...e.hu>,
Andrew Morton <akpm@...ux-foundation.org>,
Thomas Gleixner <tglx@...utronix.de>,
Wu Fengguang <fengguang.wu@...el.com>,
Peter Zijlstra <peterz@...radead.org>,
LKML <linux-kernel@...r.kernel.org>,
Nikanth Karthikesan <knikanth@...e.de>,
"Zheng, Shaohui" <shaohui.zheng@...el.com>,
"linux-hotplug@...r.kernel.org" <linux-hotplug@...r.kernel.org>,
Eric Dumazet <eric.dumazet@...il.com>,
Bjorn Helgaas <bjorn.helgaas@...com>,
Venkatesh Pallipadi <venki@...gle.com>,
Nikhil Rao <ncrao@...gle.com>,
Takuya Yoshikawa <yoshikawa.takuya@....ntt.co.jp>,
Tejun Heo <tj@...nel.org>
Subject: Re: [PATCH 1/2] x86, acpi: add MAX_LOCAL_APIC for 32bit
On Thu, 16 Dec 2010, Yinghai Lu wrote:
> Index: linux-2.6/arch/x86/include/asm/apicdef.h
> ===================================================================
> --- linux-2.6.orig/arch/x86/include/asm/apicdef.h
> +++ linux-2.6/arch/x86/include/asm/apicdef.h
> @@ -145,6 +145,7 @@
>
> #ifdef CONFIG_X86_32
> # define MAX_IO_APICS 64
> +# define MAX_LOCAL_APIC 256
> #else
> # define MAX_IO_APICS 128
> # define MAX_LOCAL_APIC 32768
> Index: linux-2.6/arch/x86/kernel/apic/apic.c
> ===================================================================
> --- linux-2.6.orig/arch/x86/kernel/apic/apic.c
> +++ linux-2.6/arch/x86/kernel/apic/apic.c
> @@ -1689,7 +1689,7 @@ void __init register_lapic_address(unsig
> * This initializes the IO-APIC and APIC hardware if this is
> * a UP kernel.
> */
> -int apic_version[MAX_APICS];
> +int apic_version[MAX_LOCAL_APIC];
>
> int __init APIC_init_uniprocessor(void)
> {
> Index: linux-2.6/arch/x86/include/asm/mpspec.h
> ===================================================================
> --- linux-2.6.orig/arch/x86/include/asm/mpspec.h
> +++ linux-2.6/arch/x86/include/asm/mpspec.h
> @@ -6,7 +6,7 @@
> #include <asm/mpspec_def.h>
> #include <asm/x86_init.h>
>
> -extern int apic_version[MAX_APICS];
> +extern int apic_version[];
> extern int pic_mode;
>
> #ifdef CONFIG_X86_32
>
This looks like it duplicates and conflicts with Tejun's NUMA unification
patchset, specifically http://marc.info/?l=linux-kernel&m=129087155712396
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists