From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751458Ab1AXTsd (ORCPT ); Mon, 24 Jan 2011 14:48:33 -0500 Received: from mail-yw0-f46.google.com ([209.85.213.46]:62523 "EHLO mail-yw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750735Ab1AXTsc convert rfc822-to-8bit (ORCPT ); Mon, 24 Jan 2011 14:48:32 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=yB/t+Rrj9zLzB6r0JJCIUtbdQlcGtb5kRb6UK/T8d5m/OuJ9gKDomm8tXVy2PfnvXk jUIAwm2zm+C+WLdq0UaSlg0/aa/y4d5v6fXqJ0vWvPwWZoqQ5/rh7uez32dZdOYkbdEZ afBoSxPmPumk74TCjoT04Msik54+svJsnKscE= MIME-Version: 1.0 In-Reply-To: <1295789862-25482-3-git-send-email-tj@kernel.org> References: <1295789862-25482-1-git-send-email-tj@kernel.org> <1295789862-25482-3-git-send-email-tj@kernel.org> Date: Mon, 24 Jan 2011 11:48:31 -0800 X-Google-Sender-Auth: tOeoitrL3mli6T5kXR5oAOg9TC4 Message-ID: Subject: Re: [PATCH 02/16] x86: Drop x86_32 MAX_APICID From: Yinghai Lu To: Tejun Heo Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com, tglx@linutronix.de, x86@kernel.org, eric.dumazet@gmail.com, brgerst@gmail.com, gorcunov@gmail.com, penberg@kernel.org, shaohui.zheng@intel.com, rientjes@google.com Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, Jan 23, 2011 at 5:37 AM, Tejun Heo 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 > Reviewed-by: Pekka Enberg > Cc: Yinghai Lu > --- >  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 > >  #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