core kernel fix
Subsystems (4)
Linus,
Please pull the latest core-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core-urgent-for-linus
HEAD: b0f4c4b32c8e3aa0d44fc4dd6c40a9a9a8d66b63 bugs, x86: Fix printk levels for panic, softlockups and stack dumps
Thanks,
Ingo
------------------>
Prarit Bhargava (1):
bugs, x86: Fix printk levels for panic, softlockups and stack dumps
arch/x86/kernel/dumpstack.c | 3 ++- arch/x86/kernel/dumpstack_64.c | 6 +++--- arch/x86/mm/fault.c | 4 ++-- kernel/watchdog.c | 2 +- lib/bug.c | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-)
arch/x86/kernel/dumpstack.c +2 -1
@@ -252,7 +252,8 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err)unsigned short ss;unsigned long sp;#endif -printk (KERN_EMERG "%s: %04lx [#%d] " , str, err &0xffff , ++die_counter); +printk (KERN_DEFAULT +"%s: %04lx [#%d] " , str, err &0xffff , ++die_counter);#ifdef CONFIG_PREEMPT printk ("PREEMPT " );#endif
arch/x86/kernel/dumpstack_64.c +3 -3
@@ -269,11 +269,11 @@ void show_registers(struct pt_regs *regs)unsigned char c;u8 *ip; -printk (KERN_EMERG "Stack:\n" ); +printk (KERN_DEFAULT "Stack:\n" );show_stack_log_lvl (NULL , regs, (unsigned long *)sp, -0 ,KERN_EMERG ); +0 ,KERN_DEFAULT ); -printk (KERN_EMERG "Code: " ); +printk (KERN_DEFAULT "Code: " ); ip = (u8 *)regs->ip - code_prologue;if (ip < (u8 *)PAGE_OFFSET ||probe_kernel_address (ip, c)) {
arch/x86/mm/fault.c +2 -2
@@ -673,7 +673,7 @@ no_context(struct pt_regs *regs, unsigned long error_code, stackend =end_of_stack (tsk);if (tsk != &init_task && *stackend !=STACK_END_MAGIC ) -printk (KERN_ALERT "Thread overran stack, or stack corrupted\n" ); +printk (KERN_EMERG "Thread overran stack, or stack corrupted\n" ); tsk->thread.cr2 = address; tsk->thread.trap_no =14 ;
@@ -684,7 +684,7 @@ no_context(struct pt_regs *regs, unsigned long error_code, sig =0 ;/* Executive summary in case the body of the oops scrolled away */ -printk (KERN_EMERG "CR2: %016lx\n" , address); +printk (KERN_DEFAULT "CR2: %016lx\n" , address);oops_end (flags, regs, sig); }
kernel/watchdog.c +1 -1
@@ -296,7 +296,7 @@ static enum hrtimer_restart watchdog_timer_fn(struct hrtimer *hrtimer)if (__this_cpu_read (soft_watchdog_warn) == true)return HRTIMER_RESTART ; -printk (KERN_ERR "BUG: soft lockup - CPU#%d stuck for %us! [%s:%d]\n" , +printk (KERN_EMERG "BUG: soft lockup - CPU#%d stuck for %us! [%s:%d]\n" ,smp_processor_id (), duration, current->comm,task_pid_nr (current));print_modules ();
lib/bug.c +1 -1
@@ -169,7 +169,7 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)return BUG_TRAP_TYPE_WARN ; } -printk (KERN_EMERG "------------[ cut here ]------------\n" ); +printk (KERN_DEFAULT "------------[ cut here ]------------\n" );if (file) printk(KERN_CRIT "kernel BUG at %s:%u!\n",