Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3904afb4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-debug-for-linus' of... 

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()
parents 502f4d4f fd8fa4d3

arch/x86/kernel/apic/hw_nmi.c

+0 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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);

	}

	if (board)

		printk(KERN_CONT "/%s", board);

	printk(KERN_CONT "\n");

}