diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2017-08-29 15:09:03 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-29 15:09:03 +0200 |
| commit | e0563e049531973e665db853e825a4efed9f881d (patch) | |
| tree | 5cf6fc0b80af1947414bc69125b11110e25494aa /include/asm-generic | |
| parent | perf/x86: Export some PMU attributes in caps/ directory (diff) | |
| parent | perf/ftrace: Fix double traces of perf on ftrace:function (diff) | |
| download | linux-dev-e0563e049531973e665db853e825a4efed9f881d.tar.xz linux-dev-e0563e049531973e665db853e825a4efed9f881d.zip | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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) |