lkml.org 
[lkml]   [2010]   [Dec]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [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


    \
     
     \ /
      Last update: 2010-12-17 22:13    [W:0.030 / U:59.800 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site