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

Commit aa6b5446 authored by Mike Travis's avatar Mike Travis Committed by Ingo Molnar
Browse files

asm-generic: add node_to_cpumask_ptr macro 



Create a simple macro to always return a pointer to the node_to_cpumask(node)
value.  This relies on compiler optimization to remove the extra indirection:

    #define node_to_cpumask_ptr(v, node) 		\
	    cpumask_t _##v = node_to_cpumask(node), *v = &_##v

For those systems with a large cpumask size, then a true pointer
to the array element can be used:

    #define node_to_cpumask_ptr(v, node)		\
	    cpumask_t *v = &(node_to_cpumask_map[node])

A node_to_cpumask_ptr_next() macro is provided to access another
node_to_cpumask value.

The other change is to always include asm-generic/topology.h moving the
ifdef CONFIG_NUMA to this same file.

Note: there are no references to either of these new macros in this patch,
only the definition.

Based on 2.6.25-rc5-mm1

# alpha
Cc: Richard Henderson <rth@twiddle.net>

# fujitsu
Cc: David Howells <dhowells@redhat.com>

# ia64
Cc: Tony Luck <tony.luck@intel.com>

# powerpc
Cc: Paul Mackerras <paulus@samba.org>
Cc: Anton Blanchard <anton@samba.org>

# sparc
Cc: David S. Miller <davem@davemloft.net>
Cc: William L. Irwin <wli@holomorphy.com>

# x86
Cc: H. Peter Anvin <hpa@zytor.com>

Signed-off-by: default avatarMike Travis <travis@sgi.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent d18d00f5

include/asm-alpha/topology.h

+1 −2
Original line number Diff line number Diff line
@@ -41,8 +41,7 @@ static inline cpumask_t node_to_cpumask(int node) 


#define pcibus_to_cpumask(bus)	(cpu_online_map)



#else /* CONFIG_NUMA */

# include <asm-generic/topology.h>

#endif /* !CONFIG_NUMA */

# include <asm-generic/topology.h>



#endif /* _ASM_ALPHA_TOPOLOGY_H */

include/asm-frv/topology.h

+1 −3
Original line number Diff line number Diff line
@@ -5,10 +5,8 @@ 


#error NUMA not supported yet



#else /* !CONFIG_NUMA */

#endif /* CONFIG_NUMA */



#include <asm-generic/topology.h>



#endif /* CONFIG_NUMA */



#endif /* _ASM_TOPOLOGY_H */

include/asm-generic/topology.h

+14 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ 
#ifndef _ASM_GENERIC_TOPOLOGY_H

#define _ASM_GENERIC_TOPOLOGY_H



#ifndef	CONFIG_NUMA



/* Other architectures wishing to use this simple topology API should fill

   in the below functions as appropriate in their own <asm/topology.h> file. */

#ifndef cpu_to_node
@@ -52,4 +54,16 @@ 
				)

#endif



#endif	/* CONFIG_NUMA */



/* returns pointer to cpumask for specified node */

#ifndef node_to_cpumask_ptr



#define	node_to_cpumask_ptr(v, node) 					\

		cpumask_t _##v = node_to_cpumask(node), *v = &_##v



#define node_to_cpumask_ptr_next(v, node)				\

			  _##v = node_to_cpumask(node)

#endif



#endif /* _ASM_GENERIC_TOPOLOGY_H */

include/asm-ia64/topology.h

+5 −0
Original line number Diff line number Diff line
@@ -116,6 +116,11 @@ void build_cpu_to_node_map(void); 
#define smt_capable() 				(smp_num_siblings > 1)

#endif



#define pcibus_to_cpumask(bus)	(pcibus_to_node(bus) == -1 ? \

					CPU_MASK_ALL : \

					node_to_cpumask(pcibus_to_node(bus)) \

				)



#include <asm-generic/topology.h>



#endif /* _ASM_IA64_TOPOLOGY_H */

include/asm-powerpc/topology.h

+1 −2
Original line number Diff line number Diff line
@@ -96,11 +96,10 @@ static inline void sysfs_remove_device_from_node(struct sys_device *dev, 
{

}



#endif /* CONFIG_NUMA */



#include <asm-generic/topology.h>



#endif /* CONFIG_NUMA */



#ifdef CONFIG_SMP

#include <asm/cputable.h>

#define smt_capable()		(cpu_has_feature(CPU_FTR_SMT))