lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'x86/mce' into x86/urgent

Browse Source 
Merge in these fixlets.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar
2012-05-30 14:12:06 +02:00
parent fa83523f45 80f033610f
commit 403e1c5b74
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/include/asm/bitops.h
View File

@@ -15,6 +15,8 @@
#include <linux/compiler.h> #include <linux/compiler.h>
#include <asm/alternative.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 * 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 * is guaranteed to be atomic. All bit operations return 0 if the bit

6
arch/x86/kernel/cpu/mcheck/mce.c
View File

@@ -1458,9 +1458,9 @@ static int __cpuinit __mcheck_cpu_apply_quirks(struct cpuinfo_x86 *c)
rdmsrl(msrs[i], val); rdmsrl(msrs[i], val);
/* CntP bit set? */ /* CntP bit set? */
if (val & BIT(62)) { if (val & BIT_64(62)) {
val &= ~BIT(62); val &= ~BIT_64(62);
wrmsrl(msrs[i], val); wrmsrl(msrs[i], val);
} }
} }

2
drivers/edac/mce_amd.h
View File

@@ -5,8 +5,6 @@
#include <asm/mce.h> #include <asm/mce.h>
#define BIT_64(n) (U64_C(1) << (n))
#define EC(x) ((x) & 0xffff) #define EC(x) ((x) & 0xffff)
#define XEC(x, mask) (((x) >> 16) & mask) #define XEC(x, mask) (((x) >> 16) & mask)