diff options
| author |   Borislav Petkov <borislav.petkov@amd.com> | 2012-05-22 12:53:46 +0200 |
|---|---|---|
| committer |   Ingo Molnar <mingo@kernel.org> | 2012-05-23 17:16:43 +0200 |
| commit | 80f033610fb968e75f5d470233d8d0260d7a72ed (patch) | |
| tree | 741c3a2c4eeed3d4bdf9cdbb792b8b3c5645aa23 /arch/x86/kernel | |
| parent | x86/bitops: Move BIT_64() for a wider use (diff) | |
| download | linux-dev-80f033610fb968e75f5d470233d8d0260d7a72ed.tar.xz linux-dev-80f033610fb968e75f5d470233d8d0260d7a72ed.zip | |
x86/mce: Fix 32-bit build
Got bitten again by the BIT() macro:
arch/x86/kernel/cpu/mcheck/mce.c: In function '__mcheck_cpu_apply_quirks':
arch/x86/kernel/cpu/mcheck/mce.c:1453:6: warning: left shift
count >= width of type arch/x86/kernel/cpu/mcheck/mce.c:1454:7: warning: left shift count >= width of type
Fix it already.
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
Cc: Frank Arnold <frank.arnold@amd.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1337684026-19740-2-git-send-email-bp@amd64.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index 888fbf9d0adf..0456b9a08086 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -1450,9 +1450,9 @@ static int __cpuinit __mcheck_cpu_apply_quirks(struct cpuinfo_x86 *c) rdmsrl(msrs[i], val); /* CntP bit set? */ - if (val & BIT(62)) { - val &= ~BIT(62); - wrmsrl(msrs[i], val); + if (val & BIT_64(62)) { + val &= ~BIT_64(62); + wrmsrl(msrs[i], val); } } |