Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751968AbcDZFPW (ORCPT ); Tue, 26 Apr 2016 01:15:22 -0400 Received: from mail-pa0-f54.google.com ([209.85.220.54]:35994 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750869AbcDZFPR (ORCPT ); Tue, 26 Apr 2016 01:15:17 -0400 Subject: Re: [PATCH v5 04/14] acpi, numa: Move acpi_numa_arch_fixup() to ia64 only To: David Daney , Will Deacon , linux-arm-kernel@lists.infradead.org, Mark Rutland , Catalin Marinas , Tony Luck , Fenghua Yu , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, "Rafael J. Wysocki" , Len Brown , Rob Herring , Frank Rowand , Grant Likely , Robert Moore , Lv Zheng , Marc Zyngier , linux-ia64@vger.kernel.org, linux-acpi@vger.kernel.org, devel@acpica.org References: <1461116439-22991-1-git-send-email-ddaney.cavm@gmail.com> <1461116439-22991-5-git-send-email-ddaney.cavm@gmail.com> Cc: linux-kernel@vger.kernel.org, Robert Richter , David Daney From: Hanjun Guo Message-ID: <571EF95D.5090703@linaro.org> Date: Tue, 26 Apr 2016 13:15:09 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.7.2 MIME-Version: 1.0 In-Reply-To: <1461116439-22991-5-git-send-email-ddaney.cavm@gmail.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3236 Lines: 100 On 2016/4/20 9:40, David Daney wrote: > From: Robert Richter > > Since acpi_numa_arch_fixup() is only used in arch ia64, move it there > to make a generic interface easier. This avoids empty function stubs > or some complex kconfig options for x86 and arm64. > > Signed-off-by: Robert Richter > Signed-off-by: David Daney > --- > arch/ia64/include/asm/acpi.h | 3 +++ > arch/ia64/kernel/acpi.c | 2 +- > arch/ia64/kernel/setup.c | 1 + > arch/x86/mm/srat.c | 2 -- > drivers/acpi/numa.c | 2 -- > include/linux/acpi.h | 1 - > 6 files changed, 5 insertions(+), 6 deletions(-) > > diff --git a/arch/ia64/include/asm/acpi.h b/arch/ia64/include/asm/acpi.h > index aa0fdf1..a3d0211 100644 > --- a/arch/ia64/include/asm/acpi.h > +++ b/arch/ia64/include/asm/acpi.h > @@ -140,6 +140,9 @@ static inline void per_cpu_scan_finalize(int min_cpus, int reserve_cpus) > } > } > } > + > +extern void acpi_numa_fixup(void); > + > #endif /* CONFIG_ACPI_NUMA */ > > #endif /*__KERNEL__*/ > diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c > index b1698bc..92b7bc9 100644 > --- a/arch/ia64/kernel/acpi.c > +++ b/arch/ia64/kernel/acpi.c > @@ -524,7 +524,7 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) > return 0; > } > > -void __init acpi_numa_arch_fixup(void) > +void __init acpi_numa_fixup(void) > { > int i, j, node_from, node_to; > > diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c > index 2029a38..afddb3e 100644 > --- a/arch/ia64/kernel/setup.c > +++ b/arch/ia64/kernel/setup.c > @@ -552,6 +552,7 @@ setup_arch (char **cmdline_p) > early_acpi_boot_init(); > # ifdef CONFIG_ACPI_NUMA > acpi_numa_init(); > + acpi_numa_fixup(); > # ifdef CONFIG_ACPI_HOTPLUG_CPU > prefill_possible_map(); > # endif > diff --git a/arch/x86/mm/srat.c b/arch/x86/mm/srat.c > index b5f8218..90b6ed9 100644 > --- a/arch/x86/mm/srat.c > +++ b/arch/x86/mm/srat.c > @@ -212,8 +212,6 @@ out_err: > return -1; > } > > -void __init acpi_numa_arch_fixup(void) {} > - > int __init x86_acpi_numa_init(void) > { > int ret; > diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c > index 2de6068..f41f06b 100644 > --- a/drivers/acpi/numa.c > +++ b/drivers/acpi/numa.c > @@ -316,8 +316,6 @@ int __init acpi_numa_init(void) > /* SLIT: System Locality Information Table */ > acpi_table_parse(ACPI_SIG_SLIT, acpi_parse_slit); > > - acpi_numa_arch_fixup(); > - > if (cnt < 0) > return cnt; > else if (!parsed_numa_memblks) > diff --git a/include/linux/acpi.h b/include/linux/acpi.h > index 06ed7e5..ab6fd96 100644 > --- a/include/linux/acpi.h > +++ b/include/linux/acpi.h > @@ -244,7 +244,6 @@ void acpi_numa_slit_init (struct acpi_table_slit *slit); > void acpi_numa_processor_affinity_init (struct acpi_srat_cpu_affinity *pa); > void acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa); > int acpi_numa_memory_affinity_init (struct acpi_srat_mem_affinity *ma); > -void acpi_numa_arch_fixup(void); > > #ifndef PHYS_CPUID_INVALID > typedef u32 phys_cpuid_t; Reviewed-by: Hanjun Guo Thanks Hanjun