diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-08 09:32:15 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-08 09:32:15 -0800 |
| commit | a07f523f264095759c6bb6e0e7a81c4d15bc3336 (patch) | |
| tree | 6e540813636ffa593f931cfc82ea36254ba82812 /arch/ia64/include/asm/topology.h | |
| parent | 2c1f1895ef2aa8f0e5497893eff71304aef332e1 (diff) | |
| parent | 6c57a332901f851bd092aba7a2b4d8ef4e643829 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] __per_cpu_idtrs[] is a memory hog
[IA64] sanity in #include files. Move fnptr to types.h
[IA64] use helpers for rlimits
[IA64] cpumask_of_node() should handle -1 as a node
Diffstat (limited to 'arch/ia64/include/asm/topology.h')
| -rw-r--r-- | arch/ia64/include/asm/topology.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/topology.h b/arch/ia64/include/asm/topology.h index 3ddb4e709db..d323071d0f9 100644 --- a/arch/ia64/include/asm/topology.h +++ b/arch/ia64/include/asm/topology.h @@ -33,7 +33,9 @@ /* * Returns a bitmask of CPUs on Node 'node'. */ -#define cpumask_of_node(node) (&node_to_cpu_mask[node]) +#define cpumask_of_node(node) ((node) == -1 ? \ + cpu_all_mask : \ + &node_to_cpu_mask[node]) /* * Returns the number of the node containing Node 'nid'. |