aboutsummaryrefslogtreecommitdiff
path: root/arch/arm64
diff options
context:
space:
mode:
authorHanjun Guo <hanjun.guo@linaro.org>2013-07-03 19:15:22 +0800
committerGraeme Gregory <graeme.gregory@linaro.org>2013-09-25 14:01:20 +0100
commitcb2cb13a48793a75b275dda70189464670b1413d (patch)
treeafd0012deff91c637741b468858383f58b55c8e4 /arch/arm64
parent4ca276681377b5840f1ea3ce442ba53523671202 (diff)
ARM64 / ACPI: Fix the variable declared but not defined
cpudata with type struct cpuinfo_arm was declared in cpu.h, but not defined at any file, so fix it. Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
Diffstat (limited to 'arch/arm64')
-rw-r--r--arch/arm64/kernel/setup.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index 7bac8b137ecf..fe8df3823add 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -56,7 +56,7 @@
#include <asm/traps.h>
#include <asm/memblock.h>
#include <asm/psci.h>
-
+#include <asm/cpu.h>
#ifdef CONFIG_ACPI
#include <asm/acpi.h>
#endif
@@ -310,16 +310,16 @@ static int __init arm64_device_init(void)
}
arch_initcall(arm64_device_init);
-static DEFINE_PER_CPU(struct cpu, cpu_data);
+DEFINE_PER_CPU(struct cpuinfo_arm, cpu_data);
static int __init topology_init(void)
{
int i;
for_each_possible_cpu(i) {
- struct cpu *cpu = &per_cpu(cpu_data, i);
- cpu->hotpluggable = 1;
- register_cpu(cpu, i);
+ struct cpuinfo_arm *cpuinfo = &per_cpu(cpu_data, i);
+ cpuinfo->cpu.hotpluggable = 1;
+ register_cpu(&cpuinfo->cpu, i);
}
return 0;