From: Ingo Molnar Date: Tue, 2 Jun 2015 06:05:42 +0000 (+0200) Subject: Merge branch 'linus' into sched/core, to resolve conflict X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f407a8258610169cd8e975dba7f0b2824562014c;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'linus' into sched/core, to resolve conflict Conflicts: arch/sparc/include/asm/topology_64.h Signed-off-by: Ingo Molnar --- f407a8258610169cd8e975dba7f0b2824562014c diff --cc arch/sparc/include/asm/topology_64.h index 9a928fcb7a9b,d1761df5cca6..01d17046225a --- a/arch/sparc/include/asm/topology_64.h +++ b/arch/sparc/include/asm/topology_64.h @@@ -40,8 -40,8 +40,8 @@@ static inline int pcibus_to_node(struc #ifdef CONFIG_SMP #define topology_physical_package_id(cpu) (cpu_data(cpu).proc_id) #define topology_core_id(cpu) (cpu_data(cpu).core_id) - #define topology_core_cpumask(cpu) (&cpu_core_map[cpu]) + #define topology_core_cpumask(cpu) (&cpu_core_sib_map[cpu]) -#define topology_thread_cpumask(cpu) (&per_cpu(cpu_sibling_map, cpu)) +#define topology_sibling_cpumask(cpu) (&per_cpu(cpu_sibling_map, cpu)) #endif /* CONFIG_SMP */ extern cpumask_t cpu_core_map[NR_CPUS];