diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-22 17:42:04 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-22 17:42:04 +0100 |
| commit | 754b9800779402924fffe456b49d557e15260cbf (patch) | |
| tree | 0e0441eca766616fccd8fc37a3885397efc6063a /mm/shmem.c | |
| parent | Merge branch 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | Merge tag 'mce-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/... (diff) | |
| download | linux-754b9800779402924fffe456b49d557e15260cbf.tar.xz linux-754b9800779402924fffe456b49d557e15260cbf.zip | |
Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull MCE changes from Ingo Molnar.
* 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/mce: Fix return value of mce_chrdev_read() when erst is disabled
x86/mce: Convert static array of pointers to per-cpu variables
x86/mce: Replace hard coded hex constants with symbolic defines
x86/mce: Recognise machine check bank signature for data path error
x86/mce: Handle "action required" errors
x86/mce: Add mechanism to safely save information in MCE handler
x86/mce: Create helper function to save addr/misc when needed
HWPOISON: Add code to handle "action required" errors.
HWPOISON: Clean up memory_failure() vs. __memory_failure()
Diffstat (limited to 'mm/shmem.c')
0 files changed, 0 insertions, 0 deletions