Re: [PATCH 02/16] x86: Drop x86_32 MAX_APICID

[Yinghai Lu]

On Sun, Jan 23, 2011 at 5:37 AM, Tejun Heo <tj@xxxxxxxxxx> wrote:
> Commit 56d91f13 (x86, acpi: Add MAX_LOCAL_APIC for 32bit) added
> MAX_LOCAL_APIC for x86_32 but didn't replace MAX_APICID users with it.
> Convert MAX_APICID users to MAX_LOCAL_APIC and drop MAX_APICID.
>
> Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
> Reviewed-by: Pekka Enberg <penberg@xxxxxxxxxx>
> Cc: Yinghai Lu <yinghai@xxxxxxxxxx>
> ---
>  arch/x86/include/asm/mpspec.h |    2 --
>  arch/x86/kernel/smpboot.c     |    2 +-
>  arch/x86/mm/srat_32.c         |    4 ++--
>  3 files changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/arch/x86/include/asm/mpspec.h b/arch/x86/include/asm/mpspec.h
> index 0c90dd9..edc2a45 100644
> --- a/arch/x86/include/asm/mpspec.h
> +++ b/arch/x86/include/asm/mpspec.h
> @@ -33,8 +33,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 c255980..d68bab5 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 ae96e7b..6027a48 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 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++){
> --

Acked-by: Yinghai Lu <yinghai@xxxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/