diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-30 11:44:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-30 11:44:18 -0700 |
| commit | 97ce89f8a4eb15a1e82be419fcd6218fe4da1fbd (patch) | |
| tree | 9860f04d4ddbb527d068493c233d2a2ed373b1e9 /include/asm-sparc/floppy.h | |
| parent | 14e07f023ff6ed3e38850a9935a05b0b8e52fa49 (diff) | |
| parent | 88d879d29f9cc0de2d930b584285638cdada6625 (diff) | |
| download | op-kernel-dev-97ce89f8a4eb15a1e82be419fcd6218fe4da1fbd.zip op-kernel-dev-97ce89f8a4eb15a1e82be419fcd6218fe4da1fbd.tar.gz | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Thomas Gleixner:
"The final fixes for 4.11:
- prevent a triple fault with function graph tracing triggered via
suspend to ram
- prevent optimizing for size when function graph tracing is enabled
and the compiler does not support -mfentry
- prevent mwaitx() being called with a zero timeout as mwaitx() might
never return. Observed on the new Ryzen CPUs"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
Prevent timer value 0 for MWAITX
x86/build: convert function graph '-Os' error to warning
ftrace/x86: Fix triple fault with graph tracing and suspend-to-ram
Diffstat (limited to 'include/asm-sparc/floppy.h')
0 files changed, 0 insertions, 0 deletions
