From mboxrd@z Thu Jan 1 00:00:00 1970 From: Will Deacon Subject: Re: [PATCH 1/2] topology, cleanup: Avoid redefinition of cpumask_of_pcibus in asm header files. Date: Wed, 2 Mar 2016 02:17:10 +0000 Message-ID: <20160302021710.GJ14022@arm.com> References: <1456358528-24213-1-git-send-email-ddaney.cavm@gmail.com> <1456358528-24213-2-git-send-email-ddaney.cavm@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <1456358528-24213-2-git-send-email-ddaney.cavm@gmail.com> Sender: linux-kernel-owner@vger.kernel.org To: David Daney Cc: linux-arm-kernel@lists.infradead.org, Mark Rutland , Catalin Marinas , Tony Luck , Fenghua Yu , James Hogan , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Martin Schwidefsky , Heiko Carstens , Yoshinori Sato , Rich Felker , "David S. Miller" , Chris Metcalf , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, Arnd Bergmann , linux-ia64@vger.kernel.org, linux-metag@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-sh@vger.ker List-Id: linux-arch.vger.kernel.org On Wed, Feb 24, 2016 at 04:02:07PM -0800, David Daney wrote: > From: Ganapatrao Kulkarni > > At present cpumask_of_pcibus is defined for !CONFIG_NUMA and moving out > to common will allow to use for numa too. This also avoids > redefinition of this macro in respective architecture header files. > > Reviewed-by: Robert Richter > Signed-off-by: Ganapatrao Kulkarni > Signed-off-by: David Daney > --- > arch/arm64/include/asm/topology.h | 3 --- > arch/ia64/include/asm/topology.h | 4 ---- > arch/metag/include/asm/topology.h | 3 --- > arch/powerpc/include/asm/topology.h | 4 ---- > arch/s390/include/asm/pci.h | 2 +- > arch/s390/include/asm/topology.h | 1 + > arch/sh/include/asm/topology.h | 3 --- > arch/tile/include/asm/pci.h | 2 -- > arch/tile/include/asm/topology.h | 3 +++ > arch/x86/include/asm/pci.h | 2 +- > arch/x86/include/asm/topology.h | 1 + > include/asm-generic/topology.h | 4 ++-- > 12 files changed, 9 insertions(+), 23 deletions(-) > > diff --git a/arch/arm64/include/asm/topology.h b/arch/arm64/include/asm/topology.h > index 8b57339..6e1f62c 100644 > --- a/arch/arm64/include/asm/topology.h > +++ b/arch/arm64/include/asm/topology.h > @@ -26,9 +26,6 @@ const struct cpumask *cpu_coregroup_mask(int cpu); > > struct pci_bus; > int pcibus_to_node(struct pci_bus *bus); > -#define cpumask_of_pcibus(bus) (pcibus_to_node(bus) == -1 ? \ > - cpu_all_mask : \ > - cpumask_of_node(pcibus_to_node(bus))) > > #endif /* CONFIG_NUMA */ Looks like a sensible clean up to me (on top of the arm64 NUMA patches): Acked-by: Will Deacon Will From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from foss.arm.com ([217.140.101.70]:56115 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754498AbcCBCRJ (ORCPT ); Tue, 1 Mar 2016 21:17:09 -0500 Date: Wed, 2 Mar 2016 02:17:10 +0000 From: Will Deacon Subject: Re: [PATCH 1/2] topology, cleanup: Avoid redefinition of cpumask_of_pcibus in asm header files. Message-ID: <20160302021710.GJ14022@arm.com> References: <1456358528-24213-1-git-send-email-ddaney.cavm@gmail.com> <1456358528-24213-2-git-send-email-ddaney.cavm@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1456358528-24213-2-git-send-email-ddaney.cavm@gmail.com> Sender: linux-arch-owner@vger.kernel.org List-ID: To: David Daney Cc: linux-arm-kernel@lists.infradead.org, Mark Rutland , Catalin Marinas , Tony Luck , Fenghua Yu , James Hogan , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Martin Schwidefsky , Heiko Carstens , Yoshinori Sato , Rich Felker , "David S. Miller" , Chris Metcalf , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, Arnd Bergmann , linux-ia64@vger.kernel.org, linux-metag@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, Ganapatrao Kulkarni , David Daney Message-ID: <20160302021710.yJTmv6B2I2mJ0jBWRKdwrvZ6Wk_QshLGkb1kkNHO_P0@z> On Wed, Feb 24, 2016 at 04:02:07PM -0800, David Daney wrote: > From: Ganapatrao Kulkarni > > At present cpumask_of_pcibus is defined for !CONFIG_NUMA and moving out > to common will allow to use for numa too. This also avoids > redefinition of this macro in respective architecture header files. > > Reviewed-by: Robert Richter > Signed-off-by: Ganapatrao Kulkarni > Signed-off-by: David Daney > --- > arch/arm64/include/asm/topology.h | 3 --- > arch/ia64/include/asm/topology.h | 4 ---- > arch/metag/include/asm/topology.h | 3 --- > arch/powerpc/include/asm/topology.h | 4 ---- > arch/s390/include/asm/pci.h | 2 +- > arch/s390/include/asm/topology.h | 1 + > arch/sh/include/asm/topology.h | 3 --- > arch/tile/include/asm/pci.h | 2 -- > arch/tile/include/asm/topology.h | 3 +++ > arch/x86/include/asm/pci.h | 2 +- > arch/x86/include/asm/topology.h | 1 + > include/asm-generic/topology.h | 4 ++-- > 12 files changed, 9 insertions(+), 23 deletions(-) > > diff --git a/arch/arm64/include/asm/topology.h b/arch/arm64/include/asm/topology.h > index 8b57339..6e1f62c 100644 > --- a/arch/arm64/include/asm/topology.h > +++ b/arch/arm64/include/asm/topology.h > @@ -26,9 +26,6 @@ const struct cpumask *cpu_coregroup_mask(int cpu); > > struct pci_bus; > int pcibus_to_node(struct pci_bus *bus); > -#define cpumask_of_pcibus(bus) (pcibus_to_node(bus) == -1 ? \ > - cpu_all_mask : \ > - cpumask_of_node(pcibus_to_node(bus))) > > #endif /* CONFIG_NUMA */ Looks like a sensible clean up to me (on top of the arm64 NUMA patches): Acked-by: Will Deacon Will