diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-09-08 04:02:35 (GMT) |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-09-08 04:02:35 (GMT) |
| commit | 537c78fc2374e2220f29f42f974ed4bce6bfe1ae (patch) | |
| tree | 51747cc16cfc17d2de714bdbe929a42ef1286b39 /include | |
| parent | f9ded7bcde96b12ea7dc81c85c09a98a71160652 (diff) | |
| parent | 8a697a50c090053cf6c53a096972dd841332fe59 (diff) | |
| download | linux-537c78fc2374e2220f29f42f974ed4bce6bfe1ae.tar.xz | |
Merge tag 'v4.9.48' into linux-linaro-lsk-v4.9
This is the 4.9.48 stable release
Diffstat (limited to 'include')
| -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 fc824e2..5d2add1 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) |