diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2019-07-08 13:06:57 -0300 | 
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2019-07-08 13:06:57 -0300 | 
| commit | e3b22a65348ab54261a98b6bc90ecf8977ff8ebf (patch) | |
| tree | 81c517d6f0e5585be7af5ffa1a4d4136b1f4a9c6 /include/linux/topology.h | |
| parent | 05c78468a60f2fd961cd0a0c01c27f288bf81204 (diff) | |
| parent | 552a031ba12a4236be107a5b082a399237758a5d (diff) | |
Merge remote-tracking branch 'tip/perf/core' into perf/urgent
To pick up fixes.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'include/linux/topology.h')
| -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)  | 
