mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 18:09:57 +00:00
Merge branch 'x86/mce' into x86/urgent
Merge in these fixlets. Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
commit
403e1c5b74
3 changed files with 5 additions and 5 deletions
|
@ -15,6 +15,8 @@
|
|||
#include <linux/compiler.h>
|
||||
#include <asm/alternative.h>
|
||||
|
||||
#define BIT_64(n) (U64_C(1) << (n))
|
||||
|
||||
/*
|
||||
* These have to be done with inline assembly: that way the bit-setting
|
||||
* is guaranteed to be atomic. All bit operations return 0 if the bit
|
||||
|
|
|
@ -1458,9 +1458,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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -5,8 +5,6 @@
|
|||
|
||||
#include <asm/mce.h>
|
||||
|
||||
#define BIT_64(n) (U64_C(1) << (n))
|
||||
|
||||
#define EC(x) ((x) & 0xffff)
|
||||
#define XEC(x, mask) (((x) >> 16) & mask)
|
||||
|
||||
|
|
Loading…
Reference in a new issue