diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-09-19 09:15:50 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-19 09:15:50 +0200 |
commit | 5e51900be6c15488b80343d3c3e62d4d605ba9a9 (patch) | |
tree | 99e60bbc949e066503b598893998286c8a42861d /arch/x86/boot | |
parent | 998564789137921acae9e367b61c5a1dc295653d (diff) | |
parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
download | op-kernel-dev-5e51900be6c15488b80343d3c3e62d4d605ba9a9.zip op-kernel-dev-5e51900be6c15488b80343d3c3e62d4d605ba9a9.tar.gz |
Merge commit 'v2.6.27-rc6' into x86/cleanups
Diffstat (limited to 'arch/x86/boot')
-rw-r--r-- | arch/x86/boot/cpucheck.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c index 4b9ae7c..4d3ff03 100644 --- a/arch/x86/boot/cpucheck.c +++ b/arch/x86/boot/cpucheck.c @@ -38,12 +38,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)) |