diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-02-01 10:36:40 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-03-02 02:42:27 -0500 |
| commit | e601757102cfd3eeae068f53b3bc1234f3a2b2e9 (patch) | |
| tree | 7459bbb9c831c133b3361913dd29ab5b5d85da16 /kernel | |
| parent | 84f001e15737f8214b0f5f0f7dfec0fb1027938f (diff) | |
sched/headers: Prepare for new header dependencies before moving code to <linux/sched/clock.h>
We are going to split <linux/sched/clock.h> out of <linux/sched.h>, which
will have to be picked up from other headers and .c files.
Create a trivial placeholder <linux/sched/clock.h> file that just
maps to <linux/sched.h> to make this patch obviously correct and
bisectable.
Include the new header in the files that are going to need it.
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/events/core.c | 1 | ||||
| -rw-r--r-- | kernel/locking/lockdep.c | 1 | ||||
| -rw-r--r-- | kernel/locking/qspinlock_stat.h | 1 | ||||
| -rw-r--r-- | kernel/printk/printk.c | 1 | ||||
| -rw-r--r-- | kernel/sched/clock.c | 1 | ||||
| -rw-r--r-- | kernel/sched/core.c | 1 | ||||
| -rw-r--r-- | kernel/sched/sched.h | 1 | ||||
| -rw-r--r-- | kernel/time/sched_clock.c | 1 | ||||
| -rw-r--r-- | kernel/time/tick-sched.c | 1 | ||||
| -rw-r--r-- | kernel/torture.c | 1 | ||||
| -rw-r--r-- | kernel/trace/ring_buffer.c | 1 | ||||
| -rw-r--r-- | kernel/trace/trace_clock.c | 1 | ||||
| -rw-r--r-- | kernel/trace/trace_hwlat.c | 1 | ||||
| -rw-r--r-- | kernel/trace/trace_output.c | 1 | ||||
| -rw-r--r-- | kernel/watchdog.c | 1 |
15 files changed, 15 insertions, 0 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index 1031bdf9f012..42fe16a84f97 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c | |||
| @@ -46,6 +46,7 @@ | |||
| 46 | #include <linux/filter.h> | 46 | #include <linux/filter.h> |
| 47 | #include <linux/namei.h> | 47 | #include <linux/namei.h> |
| 48 | #include <linux/parser.h> | 48 | #include <linux/parser.h> |
| 49 | #include <linux/sched/clock.h> | ||
| 49 | 50 | ||
| 50 | #include "internal.h" | 51 | #include "internal.h" |
| 51 | 52 | ||
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c index 9812e5dd409e..cdafaff926ca 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #define DISABLE_BRANCH_PROFILING | 28 | #define DISABLE_BRANCH_PROFILING |
| 29 | #include <linux/mutex.h> | 29 | #include <linux/mutex.h> |
| 30 | #include <linux/sched.h> | 30 | #include <linux/sched.h> |
| 31 | #include <linux/sched/clock.h> | ||
| 31 | #include <linux/delay.h> | 32 | #include <linux/delay.h> |
| 32 | #include <linux/module.h> | 33 | #include <linux/module.h> |
| 33 | #include <linux/proc_fs.h> | 34 | #include <linux/proc_fs.h> |
diff --git a/kernel/locking/qspinlock_stat.h b/kernel/locking/qspinlock_stat.h index e852be4851fc..4a30ef63c607 100644 --- a/kernel/locking/qspinlock_stat.h +++ b/kernel/locking/qspinlock_stat.h | |||
| @@ -63,6 +63,7 @@ enum qlock_stats { | |||
| 63 | */ | 63 | */ |
| 64 | #include <linux/debugfs.h> | 64 | #include <linux/debugfs.h> |
| 65 | #include <linux/sched.h> | 65 | #include <linux/sched.h> |
| 66 | #include <linux/sched/clock.h> | ||
| 66 | #include <linux/fs.h> | 67 | #include <linux/fs.h> |
| 67 | 68 | ||
| 68 | static const char * const qstat_names[qstat_num + 1] = { | 69 | static const char * const qstat_names[qstat_num + 1] = { |
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 34da86e73d00..47050eedc206 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c | |||
| @@ -45,6 +45,7 @@ | |||
| 45 | #include <linux/utsname.h> | 45 | #include <linux/utsname.h> |
| 46 | #include <linux/ctype.h> | 46 | #include <linux/ctype.h> |
| 47 | #include <linux/uio.h> | 47 | #include <linux/uio.h> |
| 48 | #include <linux/sched/clock.h> | ||
| 48 | 49 | ||
| 49 | #include <linux/uaccess.h> | 50 | #include <linux/uaccess.h> |
| 50 | #include <asm/sections.h> | 51 | #include <asm/sections.h> |
diff --git a/kernel/sched/clock.c b/kernel/sched/clock.c index ad64efe41722..dd7817cdbf58 100644 --- a/kernel/sched/clock.c +++ b/kernel/sched/clock.c | |||
| @@ -58,6 +58,7 @@ | |||
| 58 | #include <linux/percpu.h> | 58 | #include <linux/percpu.h> |
| 59 | #include <linux/ktime.h> | 59 | #include <linux/ktime.h> |
| 60 | #include <linux/sched.h> | 60 | #include <linux/sched.h> |
| 61 | #include <linux/sched/clock.h> | ||
| 61 | #include <linux/static_key.h> | 62 | #include <linux/static_key.h> |
| 62 | #include <linux/workqueue.h> | 63 | #include <linux/workqueue.h> |
| 63 | #include <linux/compiler.h> | 64 | #include <linux/compiler.h> |
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 1bd317db9810..1a7fd3d21e5a 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | * Copyright (C) 1991-2002 Linus Torvalds | 6 | * Copyright (C) 1991-2002 Linus Torvalds |
| 7 | */ | 7 | */ |
| 8 | #include <linux/sched.h> | 8 | #include <linux/sched.h> |
| 9 | #include <linux/sched/clock.h> | ||
| 9 | #include <linux/cpuset.h> | 10 | #include <linux/cpuset.h> |
| 10 | #include <linux/delayacct.h> | 11 | #include <linux/delayacct.h> |
| 11 | #include <linux/init_task.h> | 12 | #include <linux/init_task.h> |
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 683570739f46..4d386461f13a 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | #include <linux/sched/sysctl.h> | 3 | #include <linux/sched/sysctl.h> |
| 4 | #include <linux/sched/topology.h> | 4 | #include <linux/sched/topology.h> |
| 5 | #include <linux/sched/rt.h> | 5 | #include <linux/sched/rt.h> |
| 6 | #include <linux/sched/clock.h> | ||
| 6 | #include <linux/sched/wake_q.h> | 7 | #include <linux/sched/wake_q.h> |
| 7 | #include <linux/u64_stats_sync.h> | 8 | #include <linux/u64_stats_sync.h> |
| 8 | #include <linux/sched/deadline.h> | 9 | #include <linux/sched/deadline.h> |
diff --git a/kernel/time/sched_clock.c b/kernel/time/sched_clock.c index a26036d37a38..ea6b610c4c57 100644 --- a/kernel/time/sched_clock.c +++ b/kernel/time/sched_clock.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 14 | #include <linux/moduleparam.h> | 14 | #include <linux/moduleparam.h> |
| 15 | #include <linux/sched.h> | 15 | #include <linux/sched.h> |
| 16 | #include <linux/sched/clock.h> | ||
| 16 | #include <linux/syscore_ops.h> | 17 | #include <linux/syscore_ops.h> |
| 17 | #include <linux/hrtimer.h> | 18 | #include <linux/hrtimer.h> |
| 18 | #include <linux/sched_clock.h> | 19 | #include <linux/sched_clock.h> |
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index 2c115fdab397..4fee1c3abd0b 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/percpu.h> | 19 | #include <linux/percpu.h> |
| 20 | #include <linux/profile.h> | 20 | #include <linux/profile.h> |
| 21 | #include <linux/sched.h> | 21 | #include <linux/sched.h> |
| 22 | #include <linux/sched/clock.h> | ||
| 22 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 23 | #include <linux/irq_work.h> | 24 | #include <linux/irq_work.h> |
| 24 | #include <linux/posix-timers.h> | 25 | #include <linux/posix-timers.h> |
diff --git a/kernel/torture.c b/kernel/torture.c index 01a99976f072..55de96529287 100644 --- a/kernel/torture.c +++ b/kernel/torture.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/smp.h> | 30 | #include <linux/smp.h> |
| 31 | #include <linux/interrupt.h> | 31 | #include <linux/interrupt.h> |
| 32 | #include <linux/sched.h> | 32 | #include <linux/sched.h> |
| 33 | #include <linux/sched/clock.h> | ||
| 33 | #include <linux/atomic.h> | 34 | #include <linux/atomic.h> |
| 34 | #include <linux/bitops.h> | 35 | #include <linux/bitops.h> |
| 35 | #include <linux/completion.h> | 36 | #include <linux/completion.h> |
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index a85739efcc30..96fc3c043ad6 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | #include <linux/trace_events.h> | 6 | #include <linux/trace_events.h> |
| 7 | #include <linux/ring_buffer.h> | 7 | #include <linux/ring_buffer.h> |
| 8 | #include <linux/trace_clock.h> | 8 | #include <linux/trace_clock.h> |
| 9 | #include <linux/sched/clock.h> | ||
| 9 | #include <linux/trace_seq.h> | 10 | #include <linux/trace_seq.h> |
| 10 | #include <linux/spinlock.h> | 11 | #include <linux/spinlock.h> |
| 11 | #include <linux/irq_work.h> | 12 | #include <linux/irq_work.h> |
diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c index 0f06532a755b..5fdc779f411d 100644 --- a/kernel/trace/trace_clock.c +++ b/kernel/trace/trace_clock.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 19 | #include <linux/percpu.h> | 19 | #include <linux/percpu.h> |
| 20 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
| 21 | #include <linux/sched/clock.h> | ||
| 21 | #include <linux/ktime.h> | 22 | #include <linux/ktime.h> |
| 22 | #include <linux/trace_clock.h> | 23 | #include <linux/trace_clock.h> |
| 23 | 24 | ||
diff --git a/kernel/trace/trace_hwlat.c b/kernel/trace/trace_hwlat.c index edfacd954e1b..21ea6ae77d93 100644 --- a/kernel/trace/trace_hwlat.c +++ b/kernel/trace/trace_hwlat.c | |||
| @@ -44,6 +44,7 @@ | |||
| 44 | #include <linux/uaccess.h> | 44 | #include <linux/uaccess.h> |
| 45 | #include <linux/cpumask.h> | 45 | #include <linux/cpumask.h> |
| 46 | #include <linux/delay.h> | 46 | #include <linux/delay.h> |
| 47 | #include <linux/sched/clock.h> | ||
| 47 | #include "trace.h" | 48 | #include "trace.h" |
| 48 | 49 | ||
| 49 | static struct trace_array *hwlat_trace; | 50 | static struct trace_array *hwlat_trace; |
diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c index 070866c32eb9..107afca97649 100644 --- a/kernel/trace/trace_output.c +++ b/kernel/trace/trace_output.c | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | #include <linux/module.h> | 8 | #include <linux/module.h> |
| 9 | #include <linux/mutex.h> | 9 | #include <linux/mutex.h> |
| 10 | #include <linux/ftrace.h> | 10 | #include <linux/ftrace.h> |
| 11 | #include <linux/sched/clock.h> | ||
| 11 | 12 | ||
| 12 | #include "trace_output.h" | 13 | #include "trace_output.h" |
| 13 | 14 | ||
diff --git a/kernel/watchdog.c b/kernel/watchdog.c index 63177be0159e..144d7b1b0364 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/sched/rt.h> | 21 | #include <linux/sched/rt.h> |
| 22 | #include <linux/tick.h> | 22 | #include <linux/tick.h> |
| 23 | #include <linux/workqueue.h> | 23 | #include <linux/workqueue.h> |
| 24 | #include <linux/sched/clock.h> | ||
| 24 | 25 | ||
| 25 | #include <asm/irq_regs.h> | 26 | #include <asm/irq_regs.h> |
| 26 | #include <linux/kvm_para.h> | 27 | #include <linux/kvm_para.h> |
