diff options
| author | Ingo Molnar <mingo@kernel.org> | 2022-03-15 12:52:51 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2022-03-15 12:52:51 +0100 |
| commit | 9cea0d46f52f31c077a83a9b9e4e3887adfbecbe (patch) | |
| tree | 3910cec9563476f23108de6618ad55cf0c87e62a /include/linux/topology.h | |
| parent | 8c490b42fe91c10d5756efe56014240c669e7720 (diff) | |
| parent | 08f253ec3767bcfafc5d32617a92cee57c63968e (diff) | |
| download | linux-9cea0d46f52f31c077a83a9b9e4e3887adfbecbe.tar.gz linux-9cea0d46f52f31c077a83a9b9e4e3887adfbecbe.tar.bz2 linux-9cea0d46f52f31c077a83a9b9e4e3887adfbecbe.zip | |
Merge branch 'x86/cpu' into x86/core, to resolve conflicts
Conflicts:
arch/x86/include/asm/cpufeatures.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/topology.h')
| -rw-r--r-- | include/linux/topology.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/topology.h b/include/linux/topology.h index a6e201758ae9..f19bc3626297 100644 --- a/include/linux/topology.h +++ b/include/linux/topology.h @@ -211,6 +211,9 @@ static inline int cpu_to_mem(int cpu) #ifndef topology_drawer_id #define topology_drawer_id(cpu) ((void)(cpu), -1) #endif +#ifndef topology_ppin +#define topology_ppin(cpu) ((void)(cpu), 0ull) +#endif #ifndef topology_sibling_cpumask #define topology_sibling_cpumask(cpu) cpumask_of(cpu) #endif |