diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-06-03 11:58:45 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-06-03 11:58:45 +0200 |
| commit | 3384c78631dd722c2cdc5c57fbdd39fc1b5a9f2d (patch) | |
| tree | e3431b09e63172968e5e4463bfffac4bf0f8fa1d /include | |
| parent | perf/x86: Use update attribute groups for default attributes (diff) | |
| parent | perf/x86/intel/rapl: Cosmetic rename internal variables in response to multi-... (diff) | |
| download | linux-3384c78631dd722c2cdc5c57fbdd39fc1b5a9f2d.tar.xz linux-3384c78631dd722c2cdc5c57fbdd39fc1b5a9f2d.zip | |
Merge branch 'x86/topology' into perf/core, to prepare for new patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/topology.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/topology.h b/include/linux/topology.h index cb0775e1ee4b..47a3e3c08036 100644 --- a/include/linux/topology.h +++ b/include/linux/topology.h @@ -184,6 +184,9 @@ static inline int cpu_to_mem(int cpu) #ifndef topology_physical_package_id #define topology_physical_package_id(cpu) ((void)(cpu), -1) #endif +#ifndef topology_die_id +#define topology_die_id(cpu) ((void)(cpu), -1) +#endif #ifndef topology_core_id #define topology_core_id(cpu) ((void)(cpu), 0) #endif @@ -193,6 +196,9 @@ static inline int cpu_to_mem(int cpu) #ifndef topology_core_cpumask #define topology_core_cpumask(cpu) cpumask_of(cpu) #endif +#ifndef topology_die_cpumask +#define topology_die_cpumask(cpu) cpumask_of(cpu) +#endif #ifdef CONFIG_SCHED_SMT static inline const struct cpumask *cpu_smt_mask(int cpu) |