aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeoff Levand <geoff@infradead.org>2016-07-18 17:32:55 -0700
committerGeoff Levand <geoff@infradead.org>2016-12-02 10:08:47 -0800
commite35f05aa6c0e4c5c59f75690d15f0c686d88e22a (patch)
tree9b402ae9700f44d7c886b31f24905752dfc886f7
parenta1dc248c17e23e3dda6a0843357f2d337f304fe2 (diff)
downloadlinux-kexec-e35f05aa6c0e4c5c59f75690d15f0c686d88e22a.tar.gz
debugging: print hyp mode
-rw-r--r--arch/arm64/kernel/smp.c2
-rw-r--r--init/main.c7
2 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
index 8507703dabe4a4..d1af7639920344 100644
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@ -264,6 +264,8 @@ asmlinkage void secondary_start_kernel(void)
local_irq_enable();
local_async_enable();
+ printk("%s:%d: HYP cpu%u: %c\n", __func__, __LINE__, cpu, (is_hyp_mode_available() ? 'y' : 'n'));
+
/*
* OK, it's off to the idle thread for us
*/
diff --git a/init/main.c b/init/main.c
index 2858be732f6d25..6611df46512ca8 100644
--- a/init/main.c
+++ b/init/main.c
@@ -476,6 +476,12 @@ static void __init mm_init(void)
ioremap_huge_init();
}
+#if defined (__aarch64__)
+# include <asm/virt.h>
+#else
+static inline int is_hyp_mode_available(void) {return 0;}
+#endif
+
asmlinkage __visible void __init start_kernel(void)
{
char *command_line;
@@ -513,6 +519,7 @@ asmlinkage __visible void __init start_kernel(void)
build_all_zonelists(NULL, NULL);
page_alloc_init();
+ printk("%s:%d: HYP cpu%u: %c\n", __func__, __LINE__, 0, (is_hyp_mode_available() ? 'y' : 'n'));
pr_notice("Kernel command line: %s\n", boot_command_line);
parse_early_param();
after_dashes = parse_args("Booting kernel",