diff options
-rw-r--r-- | arch/arm/include/asm/cpu.h | 1 | ||||
-rw-r--r-- | arch/arm/kernel/smp.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/include/asm/cpu.h b/arch/arm/include/asm/cpu.h index d797223b39d5..2744f0602550 100644 --- a/arch/arm/include/asm/cpu.h +++ b/arch/arm/include/asm/cpu.h | |||
@@ -15,6 +15,7 @@ | |||
15 | 15 | ||
16 | struct cpuinfo_arm { | 16 | struct cpuinfo_arm { |
17 | struct cpu cpu; | 17 | struct cpu cpu; |
18 | u32 cpuid; | ||
18 | #ifdef CONFIG_SMP | 19 | #ifdef CONFIG_SMP |
19 | unsigned int loops_per_jiffy; | 20 | unsigned int loops_per_jiffy; |
20 | #endif | 21 | #endif |
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c index fbc8b2623d82..7eacd84cdc9c 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c | |||
@@ -281,6 +281,7 @@ static void __cpuinit smp_store_cpu_info(unsigned int cpuid) | |||
281 | struct cpuinfo_arm *cpu_info = &per_cpu(cpu_data, cpuid); | 281 | struct cpuinfo_arm *cpu_info = &per_cpu(cpu_data, cpuid); |
282 | 282 | ||
283 | cpu_info->loops_per_jiffy = loops_per_jiffy; | 283 | cpu_info->loops_per_jiffy = loops_per_jiffy; |
284 | cpu_info->cpuid = read_cpuid_id(); | ||
284 | 285 | ||
285 | store_cpu_topology(cpuid); | 286 | store_cpu_topology(cpuid); |
286 | } | 287 | } |