The patch titled
Reintroduce NODES_SPAN_OTHER_NODES for powerpc
has been added to the -mm tree. Its filename is
reintroduce-nodes_span_other_nodes-for-powerpc.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: Reintroduce NODES_SPAN_OTHER_NODES for powerpc
From: Andy Whitcroft <apw@xxxxxxxxxxxx>
Reintroduce NODES_SPAN_OTHER_NODES for powerpc
Revert "[PATCH] Remove SPAN_OTHER_NODES config definition"
This reverts commit f62859bb6871c5e4a8e591c60befc8caaf54db8c.
Revert "[PATCH] mm: remove arch independent NODES_SPAN_OTHER_NODES"
This reverts commit a94b3ab7eab4edcc9b2cb474b188f774c331adf7.
Also update the comments to indicate that this is still required
and where its used.
Signed-off-by: Andy Whitcroft <apw@xxxxxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Mike Kravetz <kravetz@xxxxxxxxxx>
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Acked-by: Mel Gorman <mel@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/powerpc/Kconfig | 9 +++++++++
arch/powerpc/configs/pseries_defconfig | 1 +
include/linux/mmzone.h | 6 ++++++
mm/page_alloc.c | 2 ++
4 files changed, 18 insertions(+)
diff -puN arch/powerpc/configs/pseries_defconfig~reintroduce-nodes_span_other_nodes-for-powerpc arch/powerpc/configs/pseries_defconfig
--- a/arch/powerpc/configs/pseries_defconfig~reintroduce-nodes_span_other_nodes-for-powerpc
+++ a/arch/powerpc/configs/pseries_defconfig
@@ -184,6 +184,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
CONFIG_MIGRATION=y
CONFIG_RESOURCES_64BIT=y
CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
+CONFIG_NODES_SPAN_OTHER_NODES=y
# CONFIG_PPC_64K_PAGES is not set
CONFIG_SCHED_SMT=y
CONFIG_PROC_DEVICETREE=y
diff -puN arch/powerpc/Kconfig~reintroduce-nodes_span_other_nodes-for-powerpc arch/powerpc/Kconfig
--- a/arch/powerpc/Kconfig~reintroduce-nodes_span_other_nodes-for-powerpc
+++ a/arch/powerpc/Kconfig
@@ -751,6 +751,15 @@ config ARCH_MEMORY_PROBE
def_bool y
depends on MEMORY_HOTPLUG
+# Some NUMA nodes have memory ranges that span
+# other nodes. Even though a pfn is valid and
+# between a node's start and end pfns, it may not
+# reside on that node. See memmap_init_zone()
+# for details.
+config NODES_SPAN_OTHER_NODES
+ def_bool y
+ depends on NEED_MULTIPLE_NODES
+
config PPC_64K_PAGES
bool "64k page size"
depends on PPC64
diff -puN include/linux/mmzone.h~reintroduce-nodes_span_other_nodes-for-powerpc include/linux/mmzone.h
--- a/include/linux/mmzone.h~reintroduce-nodes_span_other_nodes-for-powerpc
+++ a/include/linux/mmzone.h
@@ -674,6 +674,12 @@ void sparse_init(void);
#define sparse_index_init(_sec, _nid) do {} while (0)
#endif /* CONFIG_SPARSEMEM */
+#ifdef CONFIG_NODES_SPAN_OTHER_NODES
+#define early_pfn_in_nid(pfn, nid) (early_pfn_to_nid(pfn) == (nid))
+#else
+#define early_pfn_in_nid(pfn, nid) (1)
+#endif
+
#ifndef early_pfn_valid
#define early_pfn_valid(pfn) (1)
#endif
diff -puN mm/page_alloc.c~reintroduce-nodes_span_other_nodes-for-powerpc mm/page_alloc.c
--- a/mm/page_alloc.c~reintroduce-nodes_span_other_nodes-for-powerpc
+++ a/mm/page_alloc.c
@@ -1689,6 +1689,8 @@ void __meminit memmap_init_zone(unsigned
for (pfn = start_pfn; pfn < end_pfn; pfn++) {
if (!early_pfn_valid(pfn))
continue;
+ if (!early_pfn_in_nid(pfn, nid))
+ continue;
page = pfn_to_page(pfn);
set_page_links(page, zone, nid, pfn);
init_page_count(page);
_
Patches currently in -mm which might be from apw@xxxxxxxxxxxx are
ibmveth-fix-index-increment-calculation.patch
reintroduce-nodes_span_other_nodes-for-powerpc.patch
add-support-for-the-generic-backlight-device-to-the-ibm-acpi-driver-fix-2.patch
add-support-for-the-generic-backlight-device-to-the-asus-acpi-driver-fix.patch
add-support-for-the-generic-backlight-device-to-the-toshiba-acpi-driver-fix.patch
get-rid-of-zone_table.patch
deal-with-cases-of-zone_dma-meaning-the-first-zone.patch
get-rid-of-zone_table-fix-3.patch
optional-zone_dma-in-the-vm.patch
zoneid-fix-up-calculations-for-zoneid_pgshift.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
