Commit 501dacbc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull core fixes from Thomas Gleixner:
 "A small set of updates for core code:

   - Prevent tracing in functions which are called from trace patching
     via stop_machine() to prevent executing half patched function trace
     entries.

   - Remove old GCC workarounds

   - Remove pointless includes of notifier.h"

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  objtool: Remove workaround for unreachable warnings from old GCC
  notifier: Remove notifier header file wherever not used
  watchdog: Mark watchdog touch functions as notrace
parents 360bd62d 113fc083

fs/buffer.c

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 
#include <linux/buffer_head.h>

#include <linux/task_io_accounting_ops.h>

#include <linux/bio.h>

#include <linux/notifier.h>

#include <linux/cpu.h>

#include <linux/bitops.h>

#include <linux/mpage.h>

kernel/printk/printk.c

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 
#include <linux/kmsg_dump.h>

#include <linux/syslog.h>

#include <linux/cpu.h>

#include <linux/notifier.h>

#include <linux/rculist.h>

#include <linux/poll.h>

#include <linux/irq_work.h>

kernel/watchdog.c

+2 −2
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ static void __touch_watchdog(void) 
 * entering idle state.  This should only be used for scheduler events.

 * Use touch_softlockup_watchdog() for everything else.

 */

void touch_softlockup_watchdog_sched(void)

notrace void touch_softlockup_watchdog_sched(void)

{

	/*

	 * Preemption can be enabled.  It doesn't matter which CPU's timestamp
@@ -270,7 +270,7 @@ void touch_softlockup_watchdog_sched(void) 
	raw_cpu_write(watchdog_touch_ts, 0);

}



void touch_softlockup_watchdog(void)

notrace void touch_softlockup_watchdog(void)

{

	touch_softlockup_watchdog_sched();

	wq_watchdog_touch(raw_smp_processor_id());

kernel/watchdog_hld.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ static struct cpumask dead_events_mask; 
static unsigned long hardlockup_allcpu_dumped;

static atomic_t watchdog_cpus = ATOMIC_INIT(0);



void arch_touch_nmi_watchdog(void)

notrace void arch_touch_nmi_watchdog(void)

{

	/*

	 * Using __raw here because some code paths have

kernel/workqueue.c

+1 −1
Original line number Diff line number Diff line
@@ -5574,7 +5574,7 @@ static void wq_watchdog_timer_fn(struct timer_list *unused) 
	mod_timer(&wq_watchdog_timer, jiffies + thresh);

}



void wq_watchdog_touch(int cpu)

notrace void wq_watchdog_touch(int cpu)

{

	if (cpu >= 0)

		per_cpu(wq_watchdog_touched_cpu, cpu) = jiffies;

CRA Git | Maintained and supported by SUSTech CRA and CCSE