diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-28 16:49:23 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-28 16:49:23 +0100 |
commit | 4b696dcb1a55e40648ad0eec4af991c72f945a85 (patch) | |
tree | 6783476066ceec0439d612e029cd4eebd7787ea4 /arch/arc/kernel/intc-compact.c | |
parent | Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
parent | x86/mpx: Fix off-by-one comparison with nr_registers (diff) | |
download | linux-4b696dcb1a55e40648ad0eec4af991c72f945a85.tar.xz linux-4b696dcb1a55e40648ad0eec4af991c72f945a85.zip |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Thomas Gleixner:
"This update contains:
- Hopefully the last ASM CLAC fixups
- A fix for the Quark family related to the IMR lock which makes
kexec work again
- A off-by-one fix in the MPX code. Ironic, isn't it?
- A fix for X86_PAE which addresses once more an unsigned long vs
phys_addr_t hickup"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/mpx: Fix off-by-one comparison with nr_registers
x86/mm: Fix slow_virt_to_phys() for X86_PAE again
x86/entry/compat: Add missing CLAC to entry_INT80_32
x86/entry/32: Add an ASM_CLAC to entry_SYSENTER_32
x86/platform/intel/quark: Change the kernel's IMR lock bit to false
Diffstat (limited to 'arch/arc/kernel/intc-compact.c')
0 files changed, 0 insertions, 0 deletions