Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759455AbaJ3Tvk (ORCPT ); Thu, 30 Oct 2014 15:51:40 -0400 Received: from v094114.home.net.pl ([79.96.170.134]:61148 "HELO v094114.home.net.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1756818AbaJ3Tvj (ORCPT ); Thu, 30 Oct 2014 15:51:39 -0400 From: "Rafael J. Wysocki" To: Hanjun Guo Cc: Jiang Liu , Lorenzo Pieralisi , Mark Rutland , Tony Luck , "H. Peter Anvin" , Grant Likely , Sudeep Holla , Lv Zheng , linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org Subject: Re: [PATCH 3/3] ACPI / processor: Rename acpi_(un)map_lsapic() to acpi_(un)map_cpu() Date: Thu, 30 Oct 2014 21:12:17 +0100 Message-ID: <2516177.7dftOY8x88@vostro.rjw.lan> User-Agent: KMail/4.11.5 (Linux/3.16.0-rc5+; KDE/4.11.5; x86_64; ; ) In-Reply-To: <1414662780-2147-3-git-send-email-hanjun.guo@linaro.org> References: <1414662780-2147-1-git-send-email-hanjun.guo@linaro.org> <1414662780-2147-3-git-send-email-hanjun.guo@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thursday, October 30, 2014 05:53:00 PM Hanjun Guo wrote: > acpi_map_lsapic() will allocate a logical CPU number and map it to > physical CPU id (such as APIC id) for the hot-added CPU, it will also > do some mapping for NUMA node id and etc, acpi_unmap_lsapic() will > do the reverse. > > We can see that the name of the function is a little bit confusing and > arch dependent so rename them as acpi_(un)map_map() to make arch That's acpi_(un)map_cpu() I guess? > agnostic and explicit. > > Signed-off-by: Hanjun Guo > --- > arch/ia64/kernel/acpi.c | 9 ++++----- > arch/x86/kernel/acpi/boot.c | 9 ++++----- > drivers/acpi/acpi_processor.c | 6 +++--- > include/linux/acpi.h | 4 ++-- > 4 files changed, 13 insertions(+), 15 deletions(-) > > diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c > index 615ef81..e795cb8 100644 > --- a/arch/ia64/kernel/acpi.c > +++ b/arch/ia64/kernel/acpi.c > @@ -893,13 +893,13 @@ static int _acpi_map_lsapic(acpi_handle handle, int physid, int *pcpu) > } > > /* wrapper to silence section mismatch warning */ > -int __ref acpi_map_lsapic(acpi_handle handle, int physid, int *pcpu) > +int __ref acpi_map_cpu(acpi_handle handle, int physid, int *pcpu) > { > return _acpi_map_lsapic(handle, physid, pcpu); > } > -EXPORT_SYMBOL(acpi_map_lsapic); > +EXPORT_SYMBOL(acpi_map_cpu); > > -int acpi_unmap_lsapic(int cpu) > +int acpi_unmap_cpu(int cpu) > { > ia64_cpu_to_sapicid[cpu] = -1; > set_cpu_present(cpu, false); > @@ -910,8 +910,7 @@ int acpi_unmap_lsapic(int cpu) > > return (0); > } > - > -EXPORT_SYMBOL(acpi_unmap_lsapic); > +EXPORT_SYMBOL(acpi_unmap_cpu); > #endif /* CONFIG_ACPI_HOTPLUG_CPU */ > > #ifdef CONFIG_ACPI_NUMA > diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c > index b436fc7..6a327c6 100644 > --- a/arch/x86/kernel/acpi/boot.c > +++ b/arch/x86/kernel/acpi/boot.c > @@ -731,13 +731,13 @@ static int _acpi_map_lsapic(acpi_handle handle, int physid, int *pcpu) > } > > /* wrapper to silence section mismatch warning */ > -int __ref acpi_map_lsapic(acpi_handle handle, int physid, int *pcpu) > +int __ref acpi_map_cpu(acpi_handle handle, int physid, int *pcpu) > { > return _acpi_map_lsapic(handle, physid, pcpu); > } > -EXPORT_SYMBOL(acpi_map_lsapic); > +EXPORT_SYMBOL(acpi_map_cpu); > > -int acpi_unmap_lsapic(int cpu) > +int acpi_unmap_cpu(int cpu) > { > #ifdef CONFIG_ACPI_NUMA > set_apicid_to_node(per_cpu(x86_cpu_to_apicid, cpu), NUMA_NO_NODE); > @@ -749,8 +749,7 @@ int acpi_unmap_lsapic(int cpu) > > return (0); > } > - > -EXPORT_SYMBOL(acpi_unmap_lsapic); > +EXPORT_SYMBOL(acpi_unmap_cpu); > #endif /* CONFIG_ACPI_HOTPLUG_CPU */ > > int acpi_register_ioapic(acpi_handle handle, u64 phys_addr, u32 gsi_base) > diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c > index bcf3a3f..c4a8a56 100644 > --- a/drivers/acpi/acpi_processor.c > +++ b/drivers/acpi/acpi_processor.c > @@ -180,13 +180,13 @@ static int acpi_processor_hotadd_init(struct acpi_processor *pr) > cpu_maps_update_begin(); > cpu_hotplug_begin(); > > - ret = acpi_map_lsapic(pr->handle, pr->phys_id, &pr->id); > + ret = acpi_map_cpu(pr->handle, pr->phys_id, &pr->id); > if (ret) > goto out; > > ret = arch_register_cpu(pr->id); > if (ret) { > - acpi_unmap_lsapic(pr->id); > + acpi_unmap_cpu(pr->id); > goto out; > } > > @@ -458,7 +458,7 @@ static void acpi_processor_remove(struct acpi_device *device) > > /* Remove the CPU. */ > arch_unregister_cpu(pr->id); > - acpi_unmap_lsapic(pr->id); > + acpi_unmap_cpu(pr->id); > > cpu_hotplug_done(); > cpu_maps_update_done(); > diff --git a/include/linux/acpi.h b/include/linux/acpi.h > index 407a12f..4043e77 100644 > --- a/include/linux/acpi.h > +++ b/include/linux/acpi.h > @@ -142,8 +142,8 @@ void acpi_numa_arch_fixup(void); > > #ifdef CONFIG_ACPI_HOTPLUG_CPU > /* Arch dependent functions for cpu hotplug support */ > -int acpi_map_lsapic(acpi_handle handle, int physid, int *pcpu); > -int acpi_unmap_lsapic(int cpu); > +int acpi_map_cpu(acpi_handle handle, int physid, int *pcpu); > +int acpi_unmap_cpu(int cpu); > #endif /* CONFIG_ACPI_HOTPLUG_CPU */ > > int acpi_register_ioapic(acpi_handle handle, u64 phys_addr, u32 gsi_base); > -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/