diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-23 18:01:52 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-23 18:01:52 (GMT) |
| commit | 70311aaa8afb9790fb91886749cbf80e7e6cd8d0 (patch) | |
| tree | 6a8994e2df8a4a2f143c458d7a31dad2bae1a08b /arch/x86/include/asm/futex.h | |
| parent | ec0d7f18ab7b5097d7c0c8f3d909ca1031b9d5cd (diff) | |
| parent | 239e7bad43dadc43ccf4bbf51f798189fd2cc120 (diff) | |
| download | linux-fsl-qoriq-70311aaa8afb9790fb91886749cbf80e7e6cd8d0.tar.xz | |
Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull MCE updates from Ingo Molnar:
"This tree updates/fixes MCE hardware support, it makes the APIC LVT
thresholding interrupt optional because a subset of AMD F15h models
don't support it."
* 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, MCE, AMD: Disable error thresholding bank 4 on some models
x86, MCE, AMD: Hide interrupt_enable sysfs node
x86, MCE, AMD: Make APIC LVT thresholding interrupt optional
Diffstat (limited to 'arch/x86/include/asm/futex.h')
0 files changed, 0 insertions, 0 deletions