diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-05-30 08:12:06 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-05-30 08:12:06 -0400 |
| commit | 403e1c5b7495d7b80fae9fc4d0a7a6f5abdc3307 (patch) | |
| tree | c1f762dda525faf24aa10d6f81cf043da202c54f /drivers/edac | |
| parent | fa83523f45fbb403eba4ebc5704bf98aa4da0163 (diff) | |
| parent | 80f033610fb968e75f5d470233d8d0260d7a72ed (diff) | |
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 @@ | |||
| 5 | 5 | ||
| 6 | #include <asm/mce.h> | 6 | #include <asm/mce.h> |
| 7 | 7 | ||
| 8 | #define BIT_64(n) (U64_C(1) << (n)) | ||
| 9 | |||
| 10 | #define EC(x) ((x) & 0xffff) | 8 | #define EC(x) ((x) & 0xffff) |
| 11 | #define XEC(x, mask) (((x) >> 16) & mask) | 9 | #define XEC(x, mask) (((x) >> 16) & mask) |
| 12 | 10 | ||