summaryrefslogtreecommitdiffstats
path: root/arch/x86/boot
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2008-08-15 15:36:31 -0700
committerH. Peter Anvin <hpa@zytor.com>2008-08-18 18:22:17 -0700
commite2fe16d91228a005811335fbc4fbad5d4f5b75af (patch)
treee6e2620dbe70a4ae7653625d10aebe60d6edee48 /arch/x86/boot
parent8d02c2110b3fb8e2700b31596a582a2989fd72ba (diff)
downloadblackbird-op-linux-e2fe16d91228a005811335fbc4fbad5d4f5b75af.tar.gz
blackbird-op-linux-e2fe16d91228a005811335fbc4fbad5d4f5b75af.zip
x86: boot: stub out unimplemented CPU feature words
The CPU feature detection code in the boot code is somewhat minimal, and doesn't include all possible CPUID words. In particular, it doesn't contain the code for CPU feature words 2 (Transmeta), 3 (Linux-specific), 5 (VIA), or 7 (scattered). Zero them out, so we can still set those bits as known at compile time; in particular, this allows creating a Linux-specific NOPL flag and have it required (and therefore resolvable at compile time) in 64-bit mode. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/boot')
-rw-r--r--arch/x86/boot/cpucheck.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
index 7804389ee005..19b14f7ef9f1 100644
--- a/arch/x86/boot/cpucheck.c
+++ b/arch/x86/boot/cpucheck.c
@@ -46,12 +46,12 @@ static const u32 req_flags[NCAPINTS] =
{
REQUIRED_MASK0,
REQUIRED_MASK1,
- REQUIRED_MASK2,
- REQUIRED_MASK3,
+ 0, /* REQUIRED_MASK2 not implemented in this file */
+ 0, /* REQUIRED_MASK3 not implemented in this file */
REQUIRED_MASK4,
- REQUIRED_MASK5,
+ 0, /* REQUIRED_MASK5 not implemented in this file */
REQUIRED_MASK6,
- REQUIRED_MASK7,
+ 0, /* REQUIRED_MASK7 not implemented in this file */
};
#define A32(a, b, c, d) (((d) << 24)+((c) << 16)+((b) << 8)+(a))
OpenPOWER on IntegriCloud