diff options
| author | Ingo Molnar | 2012-05-30 14:12:06 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2012-05-30 14:12:06 +0200 |
| commit | 403e1c5b7495d7b80fae9fc4d0a7a6f5abdc3307 (patch) | |
| tree | c1f762dda525faf24aa10d6f81cf043da202c54f /drivers/edac | |
| parent | x86/mm/pat: Improve scaling of pat_pagerange_is_ram() (diff) | |
| parent | x86/mce: Fix 32-bit build (diff) | |
| download | kernel-qcow2-linux-403e1c5b7495d7b80fae9fc4d0a7a6f5abdc3307.tar.gz kernel-qcow2-linux-403e1c5b7495d7b80fae9fc4d0a7a6f5abdc3307.tar.xz kernel-qcow2-linux-403e1c5b7495d7b80fae9fc4d0a7a6f5abdc3307.zip | |
Merge branch 'x86/mce' into x86/urgent
Merge in these fixlets.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/edac')
| -rw-r--r-- | drivers/edac/mce_amd.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/edac/mce_amd.h b/drivers/edac/mce_amd.h index c6074c5cd1ef..8c87a5e87057 100644 --- a/drivers/edac/mce_amd.h +++ b/drivers/edac/mce_amd.h @@ -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) |