From: David Daney <david.daney@xxxxxxxxxx> Refactor many architectures' cpumask_of_pcibus and NODE_DATA definitions by moving them to asm-generic. Tested on arm64. Build tested on ia64, m32r, powerpc, s390, sh, sparc(64), tile, x86 This patch set (arm64 portion) depends on this one: https://lkml.org/lkml/2016/2/22/1066 Earler versions of these patches were part of the arm64 NUMA patch set. They have been split out here into a separate set. Ganapatrao Kulkarni (2): topology, cleanup: Avoid redefinition of cpumask_of_pcibus in asm header files. numa, mm, cleanup: remove redundant NODE_DATA macro from asm header files. arch/arm64/include/asm/mmzone.h | 4 +--- arch/arm64/include/asm/topology.h | 3 --- arch/ia64/include/asm/topology.h | 4 ---- arch/m32r/include/asm/mmzone.h | 4 +--- arch/metag/include/asm/mmzone.h | 4 +--- arch/metag/include/asm/topology.h | 3 --- arch/powerpc/include/asm/mmzone.h | 8 ++------ arch/powerpc/include/asm/topology.h | 4 ---- arch/s390/include/asm/mmzone.h | 6 +----- arch/s390/include/asm/pci.h | 2 +- arch/s390/include/asm/topology.h | 1 + arch/sh/include/asm/mmzone.h | 4 +--- arch/sh/include/asm/topology.h | 3 --- arch/sparc/include/asm/mmzone.h | 6 ++---- arch/tile/include/asm/pci.h | 2 -- arch/tile/include/asm/topology.h | 3 +++ arch/x86/include/asm/mmzone.h | 3 +-- arch/x86/include/asm/mmzone_32.h | 5 ----- arch/x86/include/asm/mmzone_64.h | 17 ----------------- arch/x86/include/asm/pci.h | 2 +- arch/x86/include/asm/topology.h | 1 + include/asm-generic/mmzone.h | 24 ++++++++++++++++++++++++ include/asm-generic/topology.h | 4 ++-- 23 files changed, 43 insertions(+), 74 deletions(-) delete mode 100644 arch/x86/include/asm/mmzone_64.h create mode 100644 include/asm-generic/mmzone.h -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe linux-arch" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html