diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-09-30 08:03:44 (GMT) |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-09-30 08:03:44 (GMT) |
commit | 648f3b69986b4d0ade57e59504a431b973ce2875 (patch) | |
tree | 6d0b6ccc6f243c1c582d52b88ab917eaffa022ba /arch/arm/kernel/smp.c | |
parent | 8ee777fd915b0e36f35a430225729007a1df6441 (diff) | |
parent | 8ec58be9f3ff2ad4a4d7bde8f48b4a4c406768e7 (diff) | |
download | linux-648f3b69986b4d0ade57e59504a431b973ce2875.tar.xz |
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 199558b..f34514a 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c @@ -42,6 +42,7 @@ #include <asm/ptrace.h> #include <asm/localtimer.h> #include <asm/smp_plat.h> +#include <asm/virt.h> /* * 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) num_online_cpus(), bogosum / (500000/HZ), (bogosum / (5000/HZ)) % 100); + + hyp_mode_check(); } void __init smp_prepare_boot_cpu(void) |