diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-22 06:25:14 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-22 06:25:14 +0400 |
| commit | 5ec29e3149d800e6db83c1b6ff441daf319cbbe2 (patch) | |
| tree | b23ecaff7078590215e91b2b6aa4c90c2d923e10 /include/linux/dm-log-userspace.h | |
| parent | abd209b7083b2f3a2a19e522f688e7569f284e5d (diff) | |
| parent | 6ff968cca1dfebd4b6fcade87c11658dbfc96932 (diff) | |
| download | linux-5ec29e3149d800e6db83c1b6ff441daf319cbbe2.tar.xz | |
Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core locking updates from Ingo Molnar:
"This update:
- extends and simplifies x86 NMI callback handling code to enhance
and fix the HP hw-watchdog driver
- simplifies the x86 NMI callback handling code to fix a kmemcheck
bug.
- enhances the hung-task debugger"
* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/nmi: Fix the type of the nmiaction.flags field
x86/nmi: Fix page faults by nmiaction if kmemcheck is enabled
x86/nmi: Add new NMI queues to deal with IO_CHK and SERR
watchdog, hpwdt: Remove priority option for NMI callback
hung task debugging: Inject NMI when hung and going to panic
Diffstat (limited to 'include/linux/dm-log-userspace.h')
0 files changed, 0 insertions, 0 deletions