diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-09-30 04:03:44 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-09-30 04:03:44 -0400 |
| commit | 648f3b69986b4d0ade57e59504a431b973ce2875 (patch) | |
| tree | 6d0b6ccc6f243c1c582d52b88ab917eaffa022ba /arch/arm/kernel/smp.c | |
| parent | 8ee777fd915b0e36f35a430225729007a1df6441 (diff) | |
| parent | 8ec58be9f3ff2ad4a4d7bde8f48b4a4c406768e7 (diff) | |
Merge branch 'hyp-boot-mode-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable
Diffstat (limited to 'arch/arm/kernel/smp.c')
| -rw-r--r-- | arch/arm/kernel/smp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c index 199558b9462e..f34514a0834e 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c | |||
| @@ -42,6 +42,7 @@ | |||
| 42 | #include <asm/ptrace.h> | 42 | #include <asm/ptrace.h> |
| 43 | #include <asm/localtimer.h> | 43 | #include <asm/localtimer.h> |
| 44 | #include <asm/smp_plat.h> | 44 | #include <asm/smp_plat.h> |
| 45 | #include <asm/virt.h> | ||
| 45 | 46 | ||
| 46 | /* | 47 | /* |
| 47 | * as from 2.5, kernels no longer have an init_tasks structure | 48 | * as from 2.5, kernels no longer have an init_tasks structure |
| @@ -290,6 +291,8 @@ void __init smp_cpus_done(unsigned int max_cpus) | |||
| 290 | num_online_cpus(), | 291 | num_online_cpus(), |
| 291 | bogosum / (500000/HZ), | 292 | bogosum / (500000/HZ), |
| 292 | (bogosum / (5000/HZ)) % 100); | 293 | (bogosum / (5000/HZ)) % 100); |
| 294 | |||
| 295 | hyp_mode_check(); | ||
| 293 | } | 296 | } |
| 294 | 297 | ||
| 295 | void __init smp_prepare_boot_cpu(void) | 298 | void __init smp_prepare_boot_cpu(void) |