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
Unified · Split
| @@ -39,7 +39,6 @@ · 38 unmodified lines | ||
| 39 | 39 | #include <linux/buffer_head.h> |
| 40 | 40 | #include <linux/task_io_accounting_ops.h> |
| 41 | 41 | #include <linux/bio.h> |
| 42 | −#include <linux/notifier.h> | |
| 43 | 42 | #include <linux/cpu.h> |
| 44 | 43 | #include <linux/bitops.h> |
| 45 | 44 | #include <linux/mpage.h> |
| @@ -38,7 +38,6 @@ · 37 unmodified lines | ||
| 38 | 38 | #include <linux/kmsg_dump.h> |
| 39 | 39 | #include <linux/syslog.h> |
| 40 | 40 | #include <linux/cpu.h> |
| 41 | −#include <linux/notifier.h> | |
| 42 | 41 | #include <linux/rculist.h> |
| 43 | 42 | #include <linux/poll.h> |
| 44 | 43 | #include <linux/irq_work.h> |
| @@ -261,7 +261,7 @@ static void __touch_watchdog(void) · 260 unmodified lines | ||
| 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) · 2 unmodified lines | ||
| 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()); |
| @@ -29,7 +29,7 @@ static struct cpumask dead_events_mask; · 28 unmodified lines | ||
| 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 |
| @@ -5574,7 +5574,7 @@ static void wq_watchdog_timer_fn(struct timer_list *unused) · 5573 unmodified lines | ||
| 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; |
| @@ -4,7 +4,6 @@ · 3 unmodified lines | ||
| 4 | 4 | */ |
| 5 | 5 | |
| 6 | 6 | #include <linux/percpu_counter.h> |
| 7 | −#include <linux/notifier.h> | |
| 8 | 7 | #include <linux/mutex.h> |
| 9 | 8 | #include <linux/init.h> |
| 10 | 9 | #include <linux/cpu.h> |
| @@ -27,7 +27,6 @@ · 26 unmodified lines | ||
| 27 | 27 | #include <linux/mpage.h> |
| 28 | 28 | #include <linux/rmap.h> |
| 29 | 29 | #include <linux/percpu.h> |
| 30 | −#include <linux/notifier.h> | |
| 31 | 30 | #include <linux/smp.h> |
| 32 | 31 | #include <linux/sysctl.h> |
| 33 | 32 | #include <linux/cpu.h> |
| @@ -32,7 +32,6 @@ · 31 unmodified lines | ||
| 32 | 32 | #include <linux/slab.h> |
| 33 | 33 | #include <linux/ratelimit.h> |
| 34 | 34 | #include <linux/oom.h> |
| 35 | −#include <linux/notifier.h> | |
| 36 | 35 | #include <linux/topology.h> |
| 37 | 36 | #include <linux/sysctl.h> |
| 38 | 37 | #include <linux/cpu.h> |
| @@ -19,7 +19,6 @@ · 18 unmodified lines | ||
| 19 | 19 | #include <linux/slab.h> |
| 20 | 20 | #include "slab.h" |
| 21 | 21 | #include <linux/proc_fs.h> |
| 22 | −#include <linux/notifier.h> | |
| 23 | 22 | #include <linux/seq_file.h> |
| 24 | 23 | #include <linux/kasan.h> |
| 25 | 24 | #include <linux/cpu.h> |
| @@ -93,7 +93,6 @@ · 92 unmodified lines | ||
| 93 | 93 | #include <linux/netdevice.h> |
| 94 | 94 | #include <linux/etherdevice.h> |
| 95 | 95 | #include <linux/ethtool.h> |
| 96 | −#include <linux/notifier.h> | |
| 97 | 96 | #include <linux/skbuff.h> |
| 98 | 97 | #include <linux/bpf.h> |
| 99 | 98 | #include <linux/bpf_trace.h> |
| @@ -246,8 +246,6 @@ objtool_args += --no-fp · 245 unmodified lines | ||
| 246 | 246 | endif |
| 247 | 247 | ifdef CONFIG_GCOV_KERNEL |
| 248 | 248 | objtool_args += --no-unreachable |
| 249 | −else | |
| 250 | −objtool_args += $(call cc-ifversion, -lt, 0405, --no-unreachable) | |
| 251 | 249 | endif |
| 252 | 250 | ifdef CONFIG_RETPOLINE |
| 253 | 251 | ifneq ($(RETPOLINE_CFLAGS),) |