diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-09-08 12:02:13 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-09-08 12:02:13 +0800 |
| commit | f397aef40aba7dd9af66611d6d9b47e4d3c28c2f (patch) | |
| tree | 9a1233566036becae48446e63f5e9fcd9750d244 /include/asm-generic | |
| parent | 3fc37084db1bfabcf9c2f8dffdc3255567b329fd (diff) | |
| parent | 573b59e17e37fc19577630391c08f7b1e26609d8 (diff) | |
Merge tag 'v4.4.87' into linux-linaro-lsk-v4.4
This is the 4.4.87 stable release
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/topology.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/asm-generic/topology.h b/include/asm-generic/topology.h index fc824e2828f3..5d2add1a6c96 100644 --- a/include/asm-generic/topology.h +++ b/include/asm-generic/topology.h @@ -48,7 +48,11 @@ #define parent_node(node) ((void)(node),0) #endif #ifndef cpumask_of_node -#define cpumask_of_node(node) ((void)node, cpu_online_mask) + #ifdef CONFIG_NEED_MULTIPLE_NODES + #define cpumask_of_node(node) ((node) == 0 ? cpu_online_mask : cpu_none_mask) + #else + #define cpumask_of_node(node) ((void)node, cpu_online_mask) + #endif #endif #ifndef pcibus_to_node #define pcibus_to_node(bus) ((void)(bus), -1) |