summaryrefslogtreecommitdiffstats
path: root/arch/alpha/include
diff options
context:
space:
mode:
authorRichard Henderson <rth@twiddle.net>2011-04-28 07:29:27 -0700
committerMatt Turner <mattst88@gmail.com>2013-11-16 16:33:12 -0800
commit994dcf7055df88623d25f3593b931a018a76b502 (patch)
treec3708ed5b2558e82b88ef15e533797a400b361e5 /arch/alpha/include
parenta47e5bb5764f029f989a182b0dd2d4cce69f8b14 (diff)
downloadblackbird-op-linux-994dcf7055df88623d25f3593b931a018a76b502.tar.gz
blackbird-op-linux-994dcf7055df88623d25f3593b931a018a76b502.zip
alpha: Notice if we're being run under QEMU
When building a generic kernel, do a run-time check on the serial number, like we do for MILO. When building a custom kernel, make this a configure-time check. Signed-off-by: Richard Henderson <rth@twiddle.net>
Diffstat (limited to 'arch/alpha/include')
-rw-r--r--arch/alpha/include/asm/machvec.h18
1 files changed, 12 insertions, 6 deletions
diff --git a/arch/alpha/include/asm/machvec.h b/arch/alpha/include/asm/machvec.h
index 72dbf2359270..4ac90167d346 100644
--- a/arch/alpha/include/asm/machvec.h
+++ b/arch/alpha/include/asm/machvec.h
@@ -126,13 +126,19 @@ extern struct alpha_machine_vector alpha_mv;
#ifdef CONFIG_ALPHA_GENERIC
extern int alpha_using_srm;
+extern int alpha_using_qemu;
#else
-#ifdef CONFIG_ALPHA_SRM
-#define alpha_using_srm 1
-#else
-#define alpha_using_srm 0
-#endif
+# ifdef CONFIG_ALPHA_SRM
+# define alpha_using_srm 1
+# else
+# define alpha_using_srm 0
+# endif
+# ifdef CONFIG_ALPHA_QEMU
+# define alpha_using_qemu 1
+# else
+# define alpha_using_qemu 0
+# endif
#endif /* GENERIC */
-#endif
+#endif /* __KERNEL__ */
#endif /* __ALPHA_MACHVEC_H */
OpenPOWER on IntegriCloud