diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-23 16:54:42 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-23 16:54:42 +0200 |
commit | 642116d4ac58745b8058d32a20ca733020feb290 (patch) | |
tree | 62ac03acb31bf49a5116dcaa452a4265704ed8e1 /kernel/trace/trace_events_hist.c | |
parent | Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
parent | x86/boot/KASLR: Remove return value from handle_mem_options() (diff) | |
download | linux-642116d4ac58745b8058d32a20ca733020feb290.tar.xz linux-642116d4ac58745b8058d32a20ca733020feb290.zip |
Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 boot updates from Ingo Molnar:
"Two cleanups and a bugfix for a rare boot option combination"
* 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/boot/KASLR: Remove return value from handle_mem_options()
x86/corruption-check: Use pr_*() instead of printk()
x86/corruption-check: Fix panic in memory_corruption_check() when boot option without value is provided
Diffstat (limited to 'kernel/trace/trace_events_hist.c')
0 files changed, 0 insertions, 0 deletions