History

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

Linus Torvalds committed 8 years ago

Commit 501dacb2 parents 360bd62 113fc0811 files · +4 −13Browse files

Unified · Split

11 files
  1. fs/buffer.c +0 −1
  2. kernel/printk/printk.c +0 −1
  3. kernel/watchdog.c +2 −2
  4. kernel/watchdog_hld.c +1 −1
  5. kernel/workqueue.c +1 −1
  6. lib/percpu_counter.c +0 −1
  7. mm/page-writeback.c +0 −1
  8. mm/page_alloc.c +0 −1
  9. mm/slub.c +0 −1
  10. net/core/dev.c +0 −1
  11. scripts/Makefile.build +0 −2
fs/buffer.c+0−1
@@ -39,7 +39,6 @@ · 38 unmodified lines
39#include <linux/buffer_head.h>39#include <linux/buffer_head.h>
40#include <linux/task_io_accounting_ops.h>40#include <linux/task_io_accounting_ops.h>
41#include <linux/bio.h>41#include <linux/bio.h>
42#include <linux/notifier.h>
43#include <linux/cpu.h>42#include <linux/cpu.h>
44#include <linux/bitops.h>43#include <linux/bitops.h>
45#include <linux/mpage.h>44#include <linux/mpage.h>
kernel/printk/printk.c+0−1
@@ -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>
kernel/watchdog.c+2−2
@@ -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 */
264void touch_softlockup_watchdog_sched(void)264notrace void touch_softlockup_watchdog_sched(void)
265{265{
266 /*266 /*
267 * Preemption can be enabled. It doesn't matter which CPU's timestamp267 * 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
273void touch_softlockup_watchdog(void)273notrace 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());
kernel/watchdog_hld.c+1−1
@@ -29,7 +29,7 @@ static struct cpumask dead_events_mask; · 28 unmodified lines
29static unsigned long hardlockup_allcpu_dumped;29static unsigned long hardlockup_allcpu_dumped;
30static atomic_t watchdog_cpus = ATOMIC_INIT(0);30static atomic_t watchdog_cpus = ATOMIC_INIT(0);
31 31
32void arch_touch_nmi_watchdog(void)32notrace void arch_touch_nmi_watchdog(void)
33{33{
34 /*34 /*
35 * Using __raw here because some code paths have35 * Using __raw here because some code paths have
kernel/workqueue.c+1−1
@@ -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
5577void wq_watchdog_touch(int cpu)5577notrace 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;
lib/percpu_counter.c+0−1
@@ -4,7 +4,6 @@ · 3 unmodified lines
4 */4 */
5 5
6#include <linux/percpu_counter.h>6#include <linux/percpu_counter.h>
7#include <linux/notifier.h>
8#include <linux/mutex.h>7#include <linux/mutex.h>
9#include <linux/init.h>8#include <linux/init.h>
10#include <linux/cpu.h>9#include <linux/cpu.h>
mm/page-writeback.c+0−1
@@ -27,7 +27,6 @@ · 26 unmodified lines
27#include <linux/mpage.h>27#include <linux/mpage.h>
28#include <linux/rmap.h>28#include <linux/rmap.h>
29#include <linux/percpu.h>29#include <linux/percpu.h>
30#include <linux/notifier.h>
31#include <linux/smp.h>30#include <linux/smp.h>
32#include <linux/sysctl.h>31#include <linux/sysctl.h>
33#include <linux/cpu.h>32#include <linux/cpu.h>
mm/page_alloc.c+0−1
@@ -32,7 +32,6 @@ · 31 unmodified lines
32#include <linux/slab.h>32#include <linux/slab.h>
33#include <linux/ratelimit.h>33#include <linux/ratelimit.h>
34#include <linux/oom.h>34#include <linux/oom.h>
35#include <linux/notifier.h>
36#include <linux/topology.h>35#include <linux/topology.h>
37#include <linux/sysctl.h>36#include <linux/sysctl.h>
38#include <linux/cpu.h>37#include <linux/cpu.h>
mm/slub.c+0−1
@@ -19,7 +19,6 @@ · 18 unmodified lines
19#include <linux/slab.h>19#include <linux/slab.h>
20#include "slab.h"20#include "slab.h"
21#include <linux/proc_fs.h>21#include <linux/proc_fs.h>
22#include <linux/notifier.h>
23#include <linux/seq_file.h>22#include <linux/seq_file.h>
24#include <linux/kasan.h>23#include <linux/kasan.h>
25#include <linux/cpu.h>24#include <linux/cpu.h>
net/core/dev.c+0−1
@@ -93,7 +93,6 @@ · 92 unmodified lines
93#include <linux/netdevice.h>93#include <linux/netdevice.h>
94#include <linux/etherdevice.h>94#include <linux/etherdevice.h>
95#include <linux/ethtool.h>95#include <linux/ethtool.h>
96#include <linux/notifier.h>
97#include <linux/skbuff.h>96#include <linux/skbuff.h>
98#include <linux/bpf.h>97#include <linux/bpf.h>
99#include <linux/bpf_trace.h>98#include <linux/bpf_trace.h>
scripts/Makefile.build+0−2
@@ -246,8 +246,6 @@ objtool_args += --no-fp · 245 unmodified lines
246endif246endif
247ifdef CONFIG_GCOV_KERNEL247ifdef CONFIG_GCOV_KERNEL
248objtool_args += --no-unreachable248objtool_args += --no-unreachable
249else
250objtool_args += $(call cc-ifversion, -lt, 0405, --no-unreachable)
251endif249endif
252ifdef CONFIG_RETPOLINE250ifdef CONFIG_RETPOLINE
253ifneq ($(RETPOLINE_CFLAGS),)251ifneq ($(RETPOLINE_CFLAGS),)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t