The patch titled
hugetlb: promote NUMA_NO_NODE to generic constant
has been added to the -mm tree. Its filename is
hugetlb-promote-numa_no_node-to-generic-constant.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: hugetlb: promote NUMA_NO_NODE to generic constant
From: Lee Schermerhorn <Lee.Schermerhorn@xxxxxx>
Move definition of NUMA_NO_NODE from ia64 and x86_64 arch specific headers
to generic header 'linux/numa.h' for use in generic code. NUMA_NO_NODE
replaces bare '-1' where it's used in this series to indicate "no node id
specified". Ultimately, it can be used to replace the -1 elsewhere where
it is used similarly.
Note that in arch/x86/include/asm/topology.h, NUMA_NO_NODE is now only
defined when CONFIG_NUMA is defined. This seems to work for current usage
of NUMA_NO_NODE in x86_64 arch code, with or without CONFIG_NUMA defined.
Signed-off-by: Lee Schermerhorn <lee.schermerhorn@xxxxxx>
Cc: Adam Litke <agl@xxxxxxxxxx>
Cc: Andi Kleen <andi@xxxxxxxxxxxxxx>
Cc: Andy Whitcroft <apw@xxxxxxxxxxxxx>
Cc: Christoph Lameter <cl@xxxxxxxxxxxxxxxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Cc: Lee Schermerhorn <lee.schermerhorn@xxxxxx>
Cc: Mel Gorman <mel@xxxxxxxxx>
Cc: Nishanth Aravamudan <nacc@xxxxxxxxxx>
Cc: "Luck, Tony" <tony.luck@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/ia64/include/asm/numa.h | 2 --
arch/x86/include/asm/topology.h | 5 ++---
include/linux/numa.h | 2 ++
3 files changed, 4 insertions(+), 5 deletions(-)
diff -puN arch/ia64/include/asm/numa.h~hugetlb-promote-numa_no_node-to-generic-constant arch/ia64/include/asm/numa.h
--- a/arch/ia64/include/asm/numa.h~hugetlb-promote-numa_no_node-to-generic-constant
+++ a/arch/ia64/include/asm/numa.h
@@ -22,8 +22,6 @@
#include <asm/mmzone.h>
-#define NUMA_NO_NODE -1
-
extern u16 cpu_to_node_map[NR_CPUS] __cacheline_aligned;
extern cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned;
extern pg_data_t *pgdat_list[MAX_NUMNODES];
diff -puN arch/x86/include/asm/topology.h~hugetlb-promote-numa_no_node-to-generic-constant arch/x86/include/asm/topology.h
--- a/arch/x86/include/asm/topology.h~hugetlb-promote-numa_no_node-to-generic-constant
+++ a/arch/x86/include/asm/topology.h
@@ -35,11 +35,10 @@
# endif
#endif
-/* Node not present */
-#define NUMA_NO_NODE (-1)
-
#ifdef CONFIG_NUMA
#include <linux/cpumask.h>
+#include <linux/numa.h>
+
#include <asm/mpspec.h>
#ifdef CONFIG_X86_32
diff -puN include/linux/numa.h~hugetlb-promote-numa_no_node-to-generic-constant include/linux/numa.h
--- a/include/linux/numa.h~hugetlb-promote-numa_no_node-to-generic-constant
+++ a/include/linux/numa.h
@@ -10,4 +10,6 @@
#define MAX_NUMNODES (1 << NODES_SHIFT)
+#define NUMA_NO_NODE (-1)
+
#endif /* _LINUX_NUMA_H */
_
Patches currently in -mm which might be from Lee.Schermerhorn@xxxxxx are
hugetlb-restore-interleaving-of-bootmem-huge-pages-2631.patch
linux-next.patch
hugetlb-use-free_pool_huge_page-to-return-unused-surplus-pages-fix.patch
hugetlb-restore-interleaving-of-bootmem-huge-pages.patch
hugetlb-promote-numa_no_node-to-generic-constant.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
