Commit c985aafb authored by Petr Mladek's avatar Petr Mladek
Browse files

Merge branch 'rework/printk_safe-removal' into for-linus

parents 715d3edb 26d1982f

arch/arm/kernel/smp.c

+2 −2
Original line number Diff line number Diff line
@@ -667,9 +667,9 @@ static void do_handle_IPI(int ipinr) 
		break;



	case IPI_CPU_BACKTRACE:

		printk_nmi_enter();

		printk_deferred_enter();

		nmi_cpu_backtrace(get_irq_regs());

		printk_nmi_exit();

		printk_deferred_exit();

		break;



	default:

arch/powerpc/kernel/traps.c

+0 −1
Original line number Diff line number Diff line
@@ -171,7 +171,6 @@ extern void panic_flush_kmsg_start(void) 


extern void panic_flush_kmsg_end(void)

{

	printk_safe_flush_on_panic();

	kmsg_dump(KMSG_DUMP_PANIC);

	bust_spinlocks(0);

	debug_locks_off();

arch/powerpc/kernel/watchdog.c

+0 −5
Original line number Diff line number Diff line
@@ -184,11 +184,6 @@ static void watchdog_smp_panic(int cpu, u64 tb) 


	wd_smp_unlock(&flags);



	printk_safe_flush();

	/*

	 * printk_safe_flush() seems to require another print

	 * before anything actually goes out to console.

	 */

	if (sysctl_hardlockup_all_cpu_backtrace)

		trigger_allbutself_cpu_backtrace();

arch/powerpc/kexec/crash.c

+1 −1
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ void default_machine_crash_shutdown(struct pt_regs *regs) 
	int (*old_handler)(struct pt_regs *regs);



	/* Avoid hardlocking with irresponsive CPU holding logbuf_lock */

	printk_nmi_enter();

	printk_deferred_enter();



	/*

	 * This function is only called after the system

include/linux/hardirq.h

+0 −2
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ extern void rcu_nmi_exit(void); 
	do {							\

		lockdep_off();					\

		arch_nmi_enter();				\

		printk_nmi_enter();				\

		BUG_ON(in_nmi() == NMI_MASK);			\

		__preempt_count_add(NMI_OFFSET + HARDIRQ_OFFSET);	\

	} while (0)
@@ -135,7 +134,6 @@ extern void rcu_nmi_exit(void); 
	do {							\

		BUG_ON(!in_nmi());				\

		__preempt_count_sub(NMI_OFFSET + HARDIRQ_OFFSET);	\

		printk_nmi_exit();				\

		arch_nmi_exit();				\

		lockdep_on();					\

	} while (0)