UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
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/linux-2.6-tip 

* 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Combine printk()s in show_regs_common()
  x86: Don't call dump_stack() from arch_trigger_all_cpu_backtrace_handler()
This commit is contained in:
Linus Torvalds 2011-03-15 19:16:00 -07:00
parent 502f4d4f74 fd8fa4d3dd
commit 3904afb41d
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/kernel/apic/hw_nmi.c
View File

@ -83,7 +83,6 @@ arch_trigger_all_cpu_backtrace_handler(struct notifier_block *self,
arch_spin_lock(&lock); arch_spin_lock(&lock);
printk(KERN_WARNING "NMI backtrace for cpu %d\n", cpu); printk(KERN_WARNING "NMI backtrace for cpu %d\n", cpu);
show_regs(regs); show_regs(regs);
dump_stack();
arch_spin_unlock(&lock); arch_spin_unlock(&lock);
cpumask_clear_cpu(cpu, to_cpumask(backtrace_mask)); cpumask_clear_cpu(cpu, to_cpumask(backtrace_mask));
return NOTIFY_STOP; return NOTIFY_STOP;

7
arch/x86/kernel/process.c
View File

@ -110,12 +110,9 @@ void show_regs_common(void)
init_utsname()->release, init_utsname()->release,
(int)strcspn(init_utsname()->version, " "), (int)strcspn(init_utsname()->version, " "),
init_utsname()->version); init_utsname()->version);
printk(KERN_CONT " ");
printk(KERN_CONT " %s %s", vendor, product); printk(KERN_CONT " %s %s", vendor, product);
if (board) { if (board)
printk(KERN_CONT "/"); printk(KERN_CONT "/%s", board);
printk(KERN_CONT "%s", board);
}
printk(KERN_CONT "\n"); printk(KERN_CONT "\n");
} }