x86/debug for v2.6.39

GIT PULL Ingo Molnar 1 participant 1 message Mar 15, 2011 x86

lore

Share & tools

lore

Ingo Molnar

author

2011-03-15 20:42 UTC #0 lore raw

Linus,

Please pull the latest x86-debug-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-debug-for-linus

Thanks,

Ingo

------------------>
Jan Beulich (2):
x86: Don't call dump_stack() from arch_trigger_all_cpu_backtrace_handler()
x86: Combine printk()s in show_regs_common()

 arch/x86/kernel/apic/hw_nmi.c |    1 -
 arch/x86/kernel/process.c     |    9 +++------
 2 files changed, 3 insertions(+), 7 deletions(-)

arch/x86/kernel/apic/hw_nmi.c +0 -1

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

arch/x86/kernel/process.c +3 -6

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