diff options
author | Richard Henderson <rth@twiddle.net> | 2011-04-28 10:29:27 -0400 |
---|---|---|
committer | Matt Turner <mattst88@gmail.com> | 2013-11-16 19:33:12 -0500 |
commit | 994dcf7055df88623d25f3593b931a018a76b502 (patch) | |
tree | c3708ed5b2558e82b88ef15e533797a400b361e5 /arch/alpha/include | |
parent | a47e5bb5764f029f989a182b0dd2d4cce69f8b14 (diff) |
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.h | 18 |
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; | |||
126 | 126 | ||
127 | #ifdef CONFIG_ALPHA_GENERIC | 127 | #ifdef CONFIG_ALPHA_GENERIC |
128 | extern int alpha_using_srm; | 128 | extern int alpha_using_srm; |
129 | extern int alpha_using_qemu; | ||
129 | #else | 130 | #else |
130 | #ifdef CONFIG_ALPHA_SRM | 131 | # ifdef CONFIG_ALPHA_SRM |
131 | #define alpha_using_srm 1 | 132 | # define alpha_using_srm 1 |
132 | #else | 133 | # else |
133 | #define alpha_using_srm 0 | 134 | # define alpha_using_srm 0 |
134 | #endif | 135 | # endif |
136 | # ifdef CONFIG_ALPHA_QEMU | ||
137 | # define alpha_using_qemu 1 | ||
138 | # else | ||
139 | # define alpha_using_qemu 0 | ||
140 | # endif | ||
135 | #endif /* GENERIC */ | 141 | #endif /* GENERIC */ |
136 | 142 | ||
137 | #endif | 143 | #endif /* __KERNEL__ */ |
138 | #endif /* __ALPHA_MACHVEC_H */ | 144 | #endif /* __ALPHA_MACHVEC_H */ |