lkml.org 
[lkml]   [2010]   [Dec]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 02/16] x86: Rename x86_32 MAX_APICID to MAX_LOCAL_APIC
    Date
    Replace x86_32 MAX_APICID in include/asm/mpspec.h with MAX_LOCAL_APIC
    in include/asm/apicdef.h to make it consistent with x86_64.

    Signed-off-by: Tejun Heo <tj@kernel.org>
    Reviewed-by: Pekka Enberg <penberg@kernel.org>
    ---
    arch/x86/include/asm/apicdef.h | 1 +
    arch/x86/include/asm/mpspec.h | 2 --
    arch/x86/kernel/smpboot.c | 2 +-
    arch/x86/mm/srat_32.c | 4 ++--
    4 files changed, 4 insertions(+), 5 deletions(-)

    diff --git a/arch/x86/include/asm/apicdef.h b/arch/x86/include/asm/apicdef.h
    index a859ca4..47a30ff 100644
    --- a/arch/x86/include/asm/apicdef.h
    +++ b/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
    diff --git a/arch/x86/include/asm/mpspec.h b/arch/x86/include/asm/mpspec.h
    index c82868e..018ffc1 100644
    --- a/arch/x86/include/asm/mpspec.h
    +++ b/arch/x86/include/asm/mpspec.h
    @@ -32,8 +32,6 @@ extern int mp_bus_id_to_local[MAX_MP_BUSSES];
    extern int quad_local_to_mp_bus_id [NR_CPUS/4][4];
    #endif

    -#define MAX_APICID 256
    -
    #else /* CONFIG_X86_64: */

    #define MAX_MP_BUSSES 256
    diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
    index 4de6a00..0b32f17 100644
    --- a/arch/x86/kernel/smpboot.c
    +++ b/arch/x86/kernel/smpboot.c
    @@ -72,7 +72,7 @@
    #include <asm/i8259.h>

    #ifdef CONFIG_X86_32
    -u8 apicid_2_node[MAX_APICID];
    +u8 apicid_2_node[MAX_LOCAL_APIC];
    #endif

    /* State of each CPU */
    diff --git a/arch/x86/mm/srat_32.c b/arch/x86/mm/srat_32.c
    index a17dffd..e55e748 100644
    --- a/arch/x86/mm/srat_32.c
    +++ b/arch/x86/mm/srat_32.c
    @@ -57,7 +57,7 @@ struct node_memory_chunk_s {
    static struct node_memory_chunk_s __initdata node_memory_chunk[MAXCHUNKS];

    static int __initdata num_memory_chunks; /* total number of memory chunks */
    -static u8 __initdata apicid_to_pxm[MAX_APICID];
    +static u8 __initdata apicid_to_pxm[MAX_LOCAL_APIC];

    int numa_off __initdata;
    int acpi_numa __initdata;
    @@ -254,7 +254,7 @@ int __init get_memcfg_from_srat(void)
    printk(KERN_DEBUG "Number of memory chunks in system = %d\n",
    num_memory_chunks);

    - for (i = 0; i < MAX_APICID; i++)
    + for (i = 0; i < MAX_LOCAL_APIC; i++)
    apicid_2_node[i] = pxm_to_node(apicid_to_pxm[i]);

    for (j = 0; j < num_memory_chunks; j++){
    --
    1.7.1


    \
     
     \ /
      Last update: 2010-12-30 18:55    [W:0.041 / U:150.640 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site