Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc578706 authored by Huacai Chen's avatar Huacai Chen Committed by Ralf Baechle
Browse files

MIPS: Move CPU topology macros to topology.h 



The correct position is topology.h, and this fix macros redefinition
problems for Netlogic.

[ralf@linux-mips.org: Fix build - the original patch broke most
configurations.]

Signed-off-by: default avatarHuacai Chen <chenhc@lemote.com>
Cc: Jayachandran C. <jchandra@broadcom.com>
Cc: John Crispin <john@phrozen.org>
Cc: Steven J. Hill <Steven.Hill@imgtec.com>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: linux-mips@linux-mips.org
Cc: Fuxin Zhang <zhangfx@lemote.com>
Cc: Zhangjin Wu <wuzhangjin@gmail.com>
Patchwork: https://patchwork.linux-mips.org/patch/7575/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 42944521

arch/mips/include/asm/smp.h

+0 −5
Original line number Diff line number Diff line
@@ -37,11 +37,6 @@ extern int __cpu_logical_map[NR_CPUS]; 


#define NO_PROC_ID	(-1)



#define topology_physical_package_id(cpu)	(cpu_data[cpu].package)

#define topology_core_id(cpu)			(cpu_data[cpu].core)

#define topology_core_cpumask(cpu)		(&cpu_core_map[cpu])

#define topology_thread_cpumask(cpu)		(&cpu_sibling_map[cpu])



#define SMP_RESCHEDULE_YOURSELF 0x1	/* XXX braindead */

#define SMP_CALL_FUNCTION	0x2

/* Octeon - Tell another core to flush its icache */

arch/mips/include/asm/topology.h

+8 −0
Original line number Diff line number Diff line
@@ -9,5 +9,13 @@ 
#define __ASM_TOPOLOGY_H



#include <topology.h>

#include <linux/smp.h>



#ifdef CONFIG_SMP

#define topology_physical_package_id(cpu)	(cpu_data[cpu].package)

#define topology_core_id(cpu)			(cpu_data[cpu].core)

#define topology_core_cpumask(cpu)		(&cpu_core_map[cpu])

#define topology_thread_cpumask(cpu)		(&cpu_sibling_map[cpu])

#endif



#endif /* __ASM_TOPOLOGY_H */