Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e25b257 authored by Lee Schermerhorn's avatar Lee Schermerhorn Committed by Linus Torvalds
Browse files

hugetlb: add generic definition of NUMA_NO_NODE 



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.

Signed-off-by: default avatarLee Schermerhorn <lee.schermerhorn@hp.com>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Acked-by: default avatarMel Gorman <mel@csn.ul.ie>
Reviewed-by: default avatarAndi Kleen <andi@firstfloor.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Nishanth Aravamudan <nacc@us.ibm.com>
Cc: Adam Litke <agl@us.ibm.com>
Cc: Andy Whitcroft <apw@canonical.com>
Cc: Eric Whitney <eric.whitney@hp.com>
Cc: Christoph Lameter <cl@linux-foundation.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 06808b08

arch/ia64/include/asm/numa.h

+0 −2
Original line number Diff line number Diff line
@@ -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];

arch/x86/include/asm/topology.h

+7 −2
Original line number Diff line number Diff line
@@ -35,11 +35,16 @@ 
# endif

#endif



/* Node not present */

#define NUMA_NO_NODE	(-1)

/*

 * to preserve the visibility of NUMA_NO_NODE definition,

 * moved to there from here.  May be used independent of

 * CONFIG_NUMA.

 */

#include <linux/numa.h>



#ifdef CONFIG_NUMA

#include <linux/cpumask.h>



#include <asm/mpspec.h>



#ifdef CONFIG_X86_32

include/linux/numa.h

+2 −0
Original line number Diff line number Diff line
@@ -10,4 +10,6 @@ 


#define MAX_NUMNODES    (1 << NODES_SHIFT)



#define	NUMA_NO_NODE	(-1)



#endif /* _LINUX_NUMA_H */