openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 debug cleanup from Ingo Molnar:
 "A printk() output simplification"

* 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/dumpstack: Combine some printk()s
This commit is contained in:
Linus Torvalds 2016-05-16 16:45:03 -07:00
parent bcea36df7a 8fad7ec51e
commit 62a0027839
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
arch/x86/kernel/dumpstack.c
View File

@ -260,19 +260,12 @@ int __die(const char *str, struct pt_regs *regs, long err)
unsigned long sp; unsigned long sp;
#endif #endif
printk(KERN_DEFAULT printk(KERN_DEFAULT
"%s: %04lx [#%d] ", str, err & 0xffff, ++die_counter); "%s: %04lx [#%d]%s%s%s%s\n", str, err & 0xffff, ++die_counter,
#ifdef CONFIG_PREEMPT IS_ENABLED(CONFIG_PREEMPT) ? " PREEMPT" : "",
printk("PREEMPT "); IS_ENABLED(CONFIG_SMP) ? " SMP" : "",
#endif debug_pagealloc_enabled() ? " DEBUG_PAGEALLOC" : "",
#ifdef CONFIG_SMP IS_ENABLED(CONFIG_KASAN) ? " KASAN" : "");
printk("SMP ");
#endif
if (debug_pagealloc_enabled())
printk("DEBUG_PAGEALLOC ");
#ifdef CONFIG_KASAN
printk("KASAN");
#endif
printk("\n");
if (notify_die(DIE_OOPS, str, regs, err, if (notify_die(DIE_OOPS, str, regs, err,
current->thread.trap_nr, SIGSEGV) == NOTIFY_STOP) current->thread.trap_nr, SIGSEGV) == NOTIFY_STOP)
return 1; return 1;