diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-14 20:09:11 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-14 20:09:11 +0100 |
| commit | 161aa772f972ec75b292f25d65816a6f1cd285cf (patch) | |
| tree | cc05205d0c646b14c561a6f77a6386647d541d41 /arch/s390 | |
| parent | Merge tag 'pm+acpi-3.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | x86, smap: smap_violation() is bogus if CONFIG_X86_SMAP is off (diff) | |
| download | linux-161aa772f972ec75b292f25d65816a6f1cd285cf.tar.xz linux-161aa772f972ec75b292f25d65816a6f1cd285cf.zip | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Peter Anvin:
"A collection of small fixes:
- There still seem to be problems with asm goto which requires the
empty asm hack.
- If SMAP is disabled at compile time, don't enable it nor try to
interpret a page fault as an SMAP violation.
- Fix a case of unbounded recursion while tracing"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, smap: smap_violation() is bogus if CONFIG_X86_SMAP is off
x86, smap: Don't enable SMAP if CONFIG_X86_SMAP is disabled
compiler/gcc4: Make quirk for asm_volatile_goto() unconditional
x86: Use preempt_disable_notrace() in cycles_2_ns()
Diffstat (limited to 'arch/s390')
0 files changed, 0 insertions, 0 deletions