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
Showing the changes to kernel (4 of 11 files). Show all
Unified · Split
| @@ -38,7 +38,6 @@ · 37 unmodified lines | |||
| 38 | #include <linux/kmsg_dump.h> | 38 | #include <linux/kmsg_dump.h> |
| 39 | #include <linux/syslog.h> | 39 | #include <linux/syslog.h> |
| 40 | #include <linux/cpu.h> | 40 | #include <linux/cpu.h> |
| 41 | #include <linux/notifier.h> | ||
| 42 | #include <linux/rculist.h> | 41 | #include <linux/rculist.h> |
| 43 | #include <linux/poll.h> | 42 | #include <linux/poll.h> |
| 44 | #include <linux/irq_work.h> | 43 | #include <linux/irq_work.h> |
| @@ -261,7 +261,7 @@ static void __touch_watchdog(void) · 260 unmodified lines | |||
| 261 | * entering idle state. This should only be used for scheduler events. | 261 | * entering idle state. This should only be used for scheduler events. |
| 262 | * Use touch_softlockup_watchdog() for everything else. | 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 | * Preemption can be enabled. It doesn't matter which CPU's timestamp | 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 | raw_cpu_write(watchdog_touch_ts, 0); | 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 | touch_softlockup_watchdog_sched(); | 275 | touch_softlockup_watchdog_sched(); |
| 276 | wq_watchdog_touch(raw_smp_processor_id()); | 276 | wq_watchdog_touch(raw_smp_processor_id()); |
| @@ -29,7 +29,7 @@ static struct cpumask dead_events_mask; · 28 unmodified lines | |||
| 29 | static unsigned long hardlockup_allcpu_dumped; | 29 | static unsigned long hardlockup_allcpu_dumped; |
| 30 | static atomic_t watchdog_cpus = ATOMIC_INIT(0); | 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 | * Using __raw here because some code paths have | 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 | mod_timer(&wq_watchdog_timer, jiffies + thresh); | 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 | if (cpu >= 0) | 5579 | if (cpu >= 0) |
| 5580 | per_cpu(wq_watchdog_touched_cpu, cpu) = jiffies; | 5580 | per_cpu(wq_watchdog_touched_cpu, cpu) = jiffies; |