From: Graeme Gregory graeme.gregory@linaro.org
This is just a null do nothing topology.c in order to make acpi_processor driver compile on arm64. It will need to be replaced by fully functional driver at later date.
Signed-off-by: Graeme Gregory graeme.gregory@linaro.org --- arch/arm64/include/asm/cpu.h | 1 + arch/arm64/include/asm/topology.h | 8 ++++++++ arch/arm64/kernel/Makefile | 3 +++ arch/arm64/kernel/topology.c | 20 ++++++++++++++++++++ 4 files changed, 32 insertions(+) create mode 100644 arch/arm64/include/asm/topology.h create mode 100644 arch/arm64/kernel/topology.c
diff --git a/arch/arm64/include/asm/cpu.h b/arch/arm64/include/asm/cpu.h index 5341811..dbeb98d 100644 --- a/arch/arm64/include/asm/cpu.h +++ b/arch/arm64/include/asm/cpu.h @@ -10,6 +10,7 @@
#include <linux/percpu.h> #include <linux/cpu.h> +#include <linux/topology.h>
struct cpuinfo_arm { struct cpu cpu; diff --git a/arch/arm64/include/asm/topology.h b/arch/arm64/include/asm/topology.h new file mode 100644 index 0000000..22c9421 --- /dev/null +++ b/arch/arm64/include/asm/topology.h @@ -0,0 +1,8 @@ +#ifndef _ASM_ARM64_TOPOLOGY_H +#define _ASM_ARM64_TOPOLOGY_H + +void arch_fix_phys_package_id(int num, u32 slot); + +#include <asm-generic/topology.h> + +#endif /* _ASM_ARM64_TOPOLOGY_H */ diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index f8bebc1..c5e29d5 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -28,3 +28,6 @@ extra-y := $(head-y) vmlinux.lds $(call objectify,$(arm64-obj-y)): $(obj)/vdso/vdso-offsets.h $(obj)/vdso/vdso-offsets.h: $(obj)/vdso
+# Hack for now +obj-y += topology.o + diff --git a/arch/arm64/kernel/topology.c b/arch/arm64/kernel/topology.c new file mode 100644 index 0000000..cb548f1 --- /dev/null +++ b/arch/arm64/kernel/topology.c @@ -0,0 +1,20 @@ +#include <linux/cpu.h> +#include <linux/cpumask.h> +#include <linux/export.h> +#include <linux/init.h> +#include <linux/percpu.h> +#include <linux/node.h> +#include <linux/nodemask.h> +#include <linux/of.h> +#include <linux/sched.h> +#include <linux/slab.h> + +#include <asm/cputype.h> +#include <asm/topology.h> +#include <asm/cpu.h> + +void arch_fix_phys_package_id(int num, u32 slot) +{ +} +EXPORT_SYMBOL_GPL(arch_fix_phys_package_id); +