提交 501dacbc 编写于 作者: L Linus Torvalds

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
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
#include <linux/buffer_head.h> #include <linux/buffer_head.h>
#include <linux/task_io_accounting_ops.h> #include <linux/task_io_accounting_ops.h>
#include <linux/bio.h> #include <linux/bio.h>
#include <linux/notifier.h>
#include <linux/cpu.h> #include <linux/cpu.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/mpage.h> #include <linux/mpage.h>
......
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
#include <linux/kmsg_dump.h> #include <linux/kmsg_dump.h>
#include <linux/syslog.h> #include <linux/syslog.h>
#include <linux/cpu.h> #include <linux/cpu.h>
#include <linux/notifier.h>
#include <linux/rculist.h> #include <linux/rculist.h>
#include <linux/poll.h> #include <linux/poll.h>
#include <linux/irq_work.h> #include <linux/irq_work.h>
......
...@@ -261,7 +261,7 @@ static void __touch_watchdog(void) ...@@ -261,7 +261,7 @@ static void __touch_watchdog(void)
* entering idle state. This should only be used for scheduler events. * entering idle state. This should only be used for scheduler events.
* Use touch_softlockup_watchdog() for everything else. * 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 * Preemption can be enabled. It doesn't matter which CPU's timestamp
...@@ -270,7 +270,7 @@ void touch_softlockup_watchdog_sched(void) ...@@ -270,7 +270,7 @@ void touch_softlockup_watchdog_sched(void)
raw_cpu_write(watchdog_touch_ts, 0); raw_cpu_write(watchdog_touch_ts, 0);
} }
void touch_softlockup_watchdog(void) notrace void touch_softlockup_watchdog(void)
{ {
touch_softlockup_watchdog_sched(); touch_softlockup_watchdog_sched();
wq_watchdog_touch(raw_smp_processor_id()); wq_watchdog_touch(raw_smp_processor_id());
......
...@@ -29,7 +29,7 @@ static struct cpumask dead_events_mask; ...@@ -29,7 +29,7 @@ static struct cpumask dead_events_mask;
static unsigned long hardlockup_allcpu_dumped; static unsigned long hardlockup_allcpu_dumped;
static atomic_t watchdog_cpus = ATOMIC_INIT(0); 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 * Using __raw here because some code paths have
......
...@@ -5574,7 +5574,7 @@ static void wq_watchdog_timer_fn(struct timer_list *unused) ...@@ -5574,7 +5574,7 @@ static void wq_watchdog_timer_fn(struct timer_list *unused)
mod_timer(&wq_watchdog_timer, jiffies + thresh); mod_timer(&wq_watchdog_timer, jiffies + thresh);
} }
void wq_watchdog_touch(int cpu) notrace void wq_watchdog_touch(int cpu)
{ {
if (cpu >= 0) if (cpu >= 0)
per_cpu(wq_watchdog_touched_cpu, cpu) = jiffies; per_cpu(wq_watchdog_touched_cpu, cpu) = jiffies;
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
*/ */
#include <linux/percpu_counter.h> #include <linux/percpu_counter.h>
#include <linux/notifier.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/cpu.h> #include <linux/cpu.h>
......
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#include <linux/mpage.h> #include <linux/mpage.h>
#include <linux/rmap.h> #include <linux/rmap.h>
#include <linux/percpu.h> #include <linux/percpu.h>
#include <linux/notifier.h>
#include <linux/smp.h> #include <linux/smp.h>
#include <linux/sysctl.h> #include <linux/sysctl.h>
#include <linux/cpu.h> #include <linux/cpu.h>
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/ratelimit.h> #include <linux/ratelimit.h>
#include <linux/oom.h> #include <linux/oom.h>
#include <linux/notifier.h>
#include <linux/topology.h> #include <linux/topology.h>
#include <linux/sysctl.h> #include <linux/sysctl.h>
#include <linux/cpu.h> #include <linux/cpu.h>
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include <linux/slab.h> #include <linux/slab.h>
#include "slab.h" #include "slab.h"
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <linux/notifier.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/kasan.h> #include <linux/kasan.h>
#include <linux/cpu.h> #include <linux/cpu.h>
......
...@@ -93,7 +93,6 @@ ...@@ -93,7 +93,6 @@
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <linux/ethtool.h> #include <linux/ethtool.h>
#include <linux/notifier.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <linux/bpf.h> #include <linux/bpf.h>
#include <linux/bpf_trace.h> #include <linux/bpf_trace.h>
......
...@@ -246,8 +246,6 @@ objtool_args += --no-fp ...@@ -246,8 +246,6 @@ objtool_args += --no-fp
endif endif
ifdef CONFIG_GCOV_KERNEL ifdef CONFIG_GCOV_KERNEL
objtool_args += --no-unreachable objtool_args += --no-unreachable
else
objtool_args += $(call cc-ifversion, -lt, 0405, --no-unreachable)
endif endif
ifdef CONFIG_RETPOLINE ifdef CONFIG_RETPOLINE
ifneq ($(RETPOLINE_CFLAGS),) ifneq ($(RETPOLINE_CFLAGS),)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册