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

torvalds · torvalds · commit 501dacbc2435 · 2018-09-02T09:41:45.000-07:00
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
diff --git a/fs/buffer.c b/fs/buffer.c
@@ -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>
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
@@ -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>
diff --git a/kernel/watchdog.c b/kernel/watchdog.c
@@ -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());
diff --git a/kernel/watchdog_hld.c b/kernel/watchdog_hld.c
@@ -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
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
@@ -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;
diff --git a/lib/percpu_counter.c b/lib/percpu_counter.c
@@ -4,7 +4,6 @@
  */
 
 #include <linux/percpu_counter.h>
-#include <linux/notifier.h>
 #include <linux/mutex.h>
 #include <linux/init.h>
 #include <linux/cpu.h>
diff --git a/mm/page-writeback.c b/mm/page-writeback.c
@@ -27,7 +27,6 @@
 #include <linux/mpage.h>
 #include <linux/rmap.h>
 #include <linux/percpu.h>
-#include <linux/notifier.h>
 #include <linux/smp.h>
 #include <linux/sysctl.h>
 #include <linux/cpu.h>
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
@@ -32,7 +32,6 @@
 #include <linux/slab.h>
 #include <linux/ratelimit.h>
 #include <linux/oom.h>
-#include <linux/notifier.h>
 #include <linux/topology.h>
 #include <linux/sysctl.h>
 #include <linux/cpu.h>
diff --git a/mm/slub.c b/mm/slub.c
@@ -19,7 +19,6 @@
 #include <linux/slab.h>
 #include "slab.h"
 #include <linux/proc_fs.h>
-#include <linux/notifier.h>
 #include <linux/seq_file.h>
 #include <linux/kasan.h>
 #include <linux/cpu.h>
diff --git a/net/core/dev.c b/net/core/dev.c
@@ -93,7 +93,6 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
-#include <linux/notifier.h>
 #include <linux/skbuff.h>
 #include <linux/bpf.h>
 #include <linux/bpf_trace.h>
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
@@ -246,8 +246,6 @@ objtool_args += --no-fp
 endif
 ifdef CONFIG_GCOV_KERNEL
 objtool_args += --no-unreachable
-else
-objtool_args += $(call cc-ifversion, -lt, 0405, --no-unreachable)
 endif
 ifdef CONFIG_RETPOLINE
 ifneq ($(RETPOLINE_CFLAGS),)

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ static void __touch_watchdog(void)`
`261`	`261`	`* entering idle state. This should only be used for scheduler events.`
`262`	`262`	`* Use touch_softlockup_watchdog() for everything else.`
`263`	`263`	`*/`
`264`		`-void touch_softlockup_watchdog_sched(void)`
	`264`	`+notrace void touch_softlockup_watchdog_sched(void)`
`265`	`265`	`{`
`266`	`266`	`/*`
`267`	`267`	`* Preemption can be enabled. It doesn't matter which CPU's timestamp`
`@@ -270,7 +270,7 @@ void touch_softlockup_watchdog_sched(void)`
`270`	`270`	`raw_cpu_write(watchdog_touch_ts, 0);`
`271`	`271`	`}`
`272`	`272`
`273`		`-void touch_softlockup_watchdog(void)`
	`273`	`+notrace void touch_softlockup_watchdog(void)`
`274`	`274`	`{`
`275`	`275`	`touch_softlockup_watchdog_sched();`
`276`	`276`	`wq_watchdog_touch(raw_smp_processor_id());`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ static struct cpumask dead_events_mask;`
`29`	`29`	`static unsigned long hardlockup_allcpu_dumped;`
`30`	`30`	`static atomic_t watchdog_cpus = ATOMIC_INIT(0);`
`31`	`31`
`32`		`-void arch_touch_nmi_watchdog(void)`
	`32`	`+notrace void arch_touch_nmi_watchdog(void)`
`33`	`33`	`{`
`34`	`34`	`/*`
`35`	`35`	`* Using __raw here because some code paths have`
Original file line number	Diff line number	Diff line change
`@@ -5574,7 +5574,7 @@ static void wq_watchdog_timer_fn(struct timer_list *unused)`
`5574`	`5574`	`mod_timer(&wq_watchdog_timer, jiffies + thresh);`
`5575`	`5575`	`}`
`5576`	`5576`
`5577`		`-void wq_watchdog_touch(int cpu)`
	`5577`	`+notrace void wq_watchdog_touch(int cpu)`
`5578`	`5578`	`{`
`5579`	`5579`	`if (cpu >= 0)`
`5580`	`5580`	`per_cpu(wq_watchdog_touched_cpu, cpu) = jiffies;`