diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-02-01 12:07:51 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-03-02 02:42:27 -0500 |
commit | ae7e81c077d60507dcec139e40a6d10cf932cf4b (patch) | |
tree | 1cbf2ecc1d72680cb3dad5eb6174ded450585ac3 | |
parent | e601757102cfd3eeae068f53b3bc1234f3a2b2e9 (diff) |
sched/headers: Prepare for new header dependencies before moving code to <uapi/linux/sched/types.h>
We are going to move scheduler ABI details to <uapi/linux/sched/types.h>,
which will be used from a number of .c files.
Create empty placeholder header that maps to <linux/types.h>.
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>
26 files changed, 31 insertions, 0 deletions
diff --git a/arch/arm/common/bL_switcher.c b/arch/arm/common/bL_switcher.c index 46730017b3c5..083c9e517d22 100644 --- a/arch/arm/common/bL_switcher.c +++ b/arch/arm/common/bL_switcher.c | |||
@@ -14,6 +14,7 @@ | |||
14 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
15 | #include <linux/module.h> | 15 | #include <linux/module.h> |
16 | #include <linux/sched.h> | 16 | #include <linux/sched.h> |
17 | #include <uapi/linux/sched/types.h> | ||
17 | #include <linux/interrupt.h> | 18 | #include <linux/interrupt.h> |
18 | #include <linux/cpu_pm.h> | 19 | #include <linux/cpu_pm.h> |
19 | #include <linux/cpu.h> | 20 | #include <linux/cpu.h> |
diff --git a/crypto/crypto_engine.c b/crypto/crypto_engine.c index f1bf3418d968..727bd5c3569e 100644 --- a/crypto/crypto_engine.c +++ b/crypto/crypto_engine.c | |||
@@ -16,6 +16,7 @@ | |||
16 | #include <linux/delay.h> | 16 | #include <linux/delay.h> |
17 | #include <crypto/engine.h> | 17 | #include <crypto/engine.h> |
18 | #include <crypto/internal/hash.h> | 18 | #include <crypto/internal/hash.h> |
19 | #include <uapi/linux/sched/types.h> | ||
19 | #include "internal.h" | 20 | #include "internal.h" |
20 | 21 | ||
21 | #define CRYPTO_ENGINE_MAX_QLEN 10 | 22 | #define CRYPTO_ENGINE_MAX_QLEN 10 |
diff --git a/drivers/acpi/acpi_pad.c b/drivers/acpi/acpi_pad.c index eb76a4c10dbf..754431031282 100644 --- a/drivers/acpi/acpi_pad.c +++ b/drivers/acpi/acpi_pad.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
21 | #include <linux/types.h> | 21 | #include <linux/types.h> |
22 | #include <linux/kthread.h> | 22 | #include <linux/kthread.h> |
23 | #include <uapi/linux/sched/types.h> | ||
23 | #include <linux/freezer.h> | 24 | #include <linux/freezer.h> |
24 | #include <linux/cpu.h> | 25 | #include <linux/cpu.h> |
25 | #include <linux/tick.h> | 26 | #include <linux/tick.h> |
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index c7728dd77230..8b40a5b2f8e6 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c | |||
@@ -36,6 +36,7 @@ | |||
36 | #include <linux/memcontrol.h> | 36 | #include <linux/memcontrol.h> |
37 | #include <linux/mm_inline.h> | 37 | #include <linux/mm_inline.h> |
38 | #include <linux/slab.h> | 38 | #include <linux/slab.h> |
39 | #include <uapi/linux/sched/types.h> | ||
39 | #include <linux/pkt_sched.h> | 40 | #include <linux/pkt_sched.h> |
40 | #define __KERNEL_SYSCALLS__ | 41 | #define __KERNEL_SYSCALLS__ |
41 | #include <linux/unistd.h> | 42 | #include <linux/unistd.h> |
diff --git a/drivers/firmware/psci_checker.c b/drivers/firmware/psci_checker.c index 29d58feaf675..6523ce962865 100644 --- a/drivers/firmware/psci_checker.c +++ b/drivers/firmware/psci_checker.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <linux/cpu_pm.h> | 20 | #include <linux/cpu_pm.h> |
21 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
22 | #include <linux/kthread.h> | 22 | #include <linux/kthread.h> |
23 | #include <uapi/linux/sched/types.h> | ||
23 | #include <linux/module.h> | 24 | #include <linux/module.h> |
24 | #include <linux/preempt.h> | 25 | #include <linux/preempt.h> |
25 | #include <linux/psci.h> | 26 | #include <linux/psci.h> |
diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c index 1bf83ed113b3..16f96563cd2b 100644 --- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c +++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <linux/kthread.h> | 24 | #include <linux/kthread.h> |
25 | #include <linux/wait.h> | 25 | #include <linux/wait.h> |
26 | #include <linux/sched.h> | 26 | #include <linux/sched.h> |
27 | #include <uapi/linux/sched/types.h> | ||
27 | #include <drm/drmP.h> | 28 | #include <drm/drmP.h> |
28 | #include "gpu_scheduler.h" | 29 | #include "gpu_scheduler.h" |
29 | 30 | ||
diff --git a/drivers/gpu/drm/i915/intel_breadcrumbs.c b/drivers/gpu/drm/i915/intel_breadcrumbs.c index fcfa423d08bd..7044e9a6abf7 100644 --- a/drivers/gpu/drm/i915/intel_breadcrumbs.c +++ b/drivers/gpu/drm/i915/intel_breadcrumbs.c | |||
@@ -23,6 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <linux/kthread.h> | 25 | #include <linux/kthread.h> |
26 | #include <uapi/linux/sched/types.h> | ||
26 | 27 | ||
27 | #include "i915_drv.h" | 28 | #include "i915_drv.h" |
28 | 29 | ||
diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c index ab2ae53618e8..e73c153285f0 100644 --- a/drivers/media/pci/ivtv/ivtv-driver.c +++ b/drivers/media/pci/ivtv/ivtv-driver.c | |||
@@ -59,6 +59,7 @@ | |||
59 | #include <media/tveeprom.h> | 59 | #include <media/tveeprom.h> |
60 | #include <media/i2c/saa7115.h> | 60 | #include <media/i2c/saa7115.h> |
61 | #include "tuner-xc2028.h" | 61 | #include "tuner-xc2028.h" |
62 | #include <uapi/linux/sched/types.h> | ||
62 | 63 | ||
63 | /* If you have already X v4l cards, then set this to X. This way | 64 | /* If you have already X v4l cards, then set this to X. This way |
64 | the device numbers stay matched. Example: you have a WinTV card | 65 | the device numbers stay matched. Example: you have a WinTV card |
diff --git a/drivers/mmc/core/sdio_irq.c b/drivers/mmc/core/sdio_irq.c index d29faf2addfe..6d4b72080d51 100644 --- a/drivers/mmc/core/sdio_irq.c +++ b/drivers/mmc/core/sdio_irq.c | |||
@@ -15,6 +15,7 @@ | |||
15 | 15 | ||
16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
17 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
18 | #include <uapi/linux/sched/types.h> | ||
18 | #include <linux/kthread.h> | 19 | #include <linux/kthread.h> |
19 | #include <linux/export.h> | 20 | #include <linux/export.h> |
20 | #include <linux/wait.h> | 21 | #include <linux/wait.h> |
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 44222ef9471e..90b5b2efafbf 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c | |||
@@ -33,6 +33,7 @@ | |||
33 | #include <linux/pm_domain.h> | 33 | #include <linux/pm_domain.h> |
34 | #include <linux/export.h> | 34 | #include <linux/export.h> |
35 | #include <linux/sched/rt.h> | 35 | #include <linux/sched/rt.h> |
36 | #include <uapi/linux/sched/types.h> | ||
36 | #include <linux/delay.h> | 37 | #include <linux/delay.h> |
37 | #include <linux/kthread.h> | 38 | #include <linux/kthread.h> |
38 | #include <linux/ioport.h> | 39 | #include <linux/ioport.h> |
diff --git a/drivers/staging/android/ion/ion_heap.c b/drivers/staging/android/ion/ion_heap.c index 4e5c0f17f579..c69d0bd53693 100644 --- a/drivers/staging/android/ion/ion_heap.c +++ b/drivers/staging/android/ion/ion_heap.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <linux/mm.h> | 20 | #include <linux/mm.h> |
21 | #include <linux/rtmutex.h> | 21 | #include <linux/rtmutex.h> |
22 | #include <linux/sched.h> | 22 | #include <linux/sched.h> |
23 | #include <uapi/linux/sched/types.h> | ||
23 | #include <linux/scatterlist.h> | 24 | #include <linux/scatterlist.h> |
24 | #include <linux/vmalloc.h> | 25 | #include <linux/vmalloc.h> |
25 | #include "ion.h" | 26 | #include "ion.h" |
diff --git a/drivers/thermal/intel_powerclamp.c b/drivers/thermal/intel_powerclamp.c index a47103a659fa..d718cd179ddb 100644 --- a/drivers/thermal/intel_powerclamp.c +++ b/drivers/thermal/intel_powerclamp.c | |||
@@ -50,6 +50,7 @@ | |||
50 | #include <linux/debugfs.h> | 50 | #include <linux/debugfs.h> |
51 | #include <linux/seq_file.h> | 51 | #include <linux/seq_file.h> |
52 | #include <linux/sched/rt.h> | 52 | #include <linux/sched/rt.h> |
53 | #include <uapi/linux/sched/types.h> | ||
53 | 54 | ||
54 | #include <asm/nmi.h> | 55 | #include <asm/nmi.h> |
55 | #include <asm/msr.h> | 56 | #include <asm/msr.h> |
diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c index 793395451982..ca54ce074a5f 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include <linux/tty_flip.h> | 29 | #include <linux/tty_flip.h> |
30 | #include <linux/spi/spi.h> | 30 | #include <linux/spi/spi.h> |
31 | #include <linux/uaccess.h> | 31 | #include <linux/uaccess.h> |
32 | #include <uapi/linux/sched/types.h> | ||
32 | 33 | ||
33 | #define SC16IS7XX_NAME "sc16is7xx" | 34 | #define SC16IS7XX_NAME "sc16is7xx" |
34 | #define SC16IS7XX_MAX_DEVS 8 | 35 | #define SC16IS7XX_MAX_DEVS 8 |
diff --git a/include/uapi/linux/sched/types.h b/include/uapi/linux/sched/types.h new file mode 100644 index 000000000000..d162d315f4b5 --- /dev/null +++ b/include/uapi/linux/sched/types.h | |||
@@ -0,0 +1,6 @@ | |||
1 | #ifndef _UAPI_LINUX_SCHED_TYPES_H | ||
2 | #define _UAPI_LINUX_SCHED_TYPES_H | ||
3 | |||
4 | #include <linux/types.h> | ||
5 | |||
6 | #endif /* _UAPI_LINUX_SCHED_TYPES_H */ | ||
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 944d068b6c48..09740952e4de 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <linux/slab.h> | 17 | #include <linux/slab.h> |
18 | #include <linux/sched.h> | 18 | #include <linux/sched.h> |
19 | #include <linux/sched/rt.h> | 19 | #include <linux/sched/rt.h> |
20 | #include <uapi/linux/sched/types.h> | ||
20 | #include <linux/task_work.h> | 21 | #include <linux/task_work.h> |
21 | 22 | ||
22 | #include "internals.h" | 23 | #include "internals.h" |
diff --git a/kernel/kthread.c b/kernel/kthread.c index 8461a4372e8a..ef9b9eb809c7 100644 --- a/kernel/kthread.c +++ b/kernel/kthread.c | |||
@@ -5,6 +5,7 @@ | |||
5 | * even if we're invoked from userspace (think modprobe, hotplug cpu, | 5 | * even if we're invoked from userspace (think modprobe, hotplug cpu, |
6 | * etc.). | 6 | * etc.). |
7 | */ | 7 | */ |
8 | #include <uapi/linux/sched/types.h> | ||
8 | #include <linux/sched.h> | 9 | #include <linux/sched.h> |
9 | #include <linux/kthread.h> | 10 | #include <linux/kthread.h> |
10 | #include <linux/completion.h> | 11 | #include <linux/completion.h> |
diff --git a/kernel/locking/locktorture.c b/kernel/locking/locktorture.c index 28350dc8ecbb..5ea0a8969ee2 100644 --- a/kernel/locking/locktorture.c +++ b/kernel/locking/locktorture.c | |||
@@ -32,6 +32,7 @@ | |||
32 | #include <linux/smp.h> | 32 | #include <linux/smp.h> |
33 | #include <linux/interrupt.h> | 33 | #include <linux/interrupt.h> |
34 | #include <linux/sched.h> | 34 | #include <linux/sched.h> |
35 | #include <uapi/linux/sched/types.h> | ||
35 | #include <linux/atomic.h> | 36 | #include <linux/atomic.h> |
36 | #include <linux/moduleparam.h> | 37 | #include <linux/moduleparam.h> |
37 | #include <linux/delay.h> | 38 | #include <linux/delay.h> |
diff --git a/kernel/rcu/rcuperf.c b/kernel/rcu/rcuperf.c index 123ccbd22449..a4a86fb47e4a 100644 --- a/kernel/rcu/rcuperf.c +++ b/kernel/rcu/rcuperf.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include <linux/rcupdate.h> | 30 | #include <linux/rcupdate.h> |
31 | #include <linux/interrupt.h> | 31 | #include <linux/interrupt.h> |
32 | #include <linux/sched.h> | 32 | #include <linux/sched.h> |
33 | #include <uapi/linux/sched/types.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/rcu/rcutorture.c b/kernel/rcu/rcutorture.c index d81345be730e..6a28b79710f0 100644 --- a/kernel/rcu/rcutorture.c +++ b/kernel/rcu/rcutorture.c | |||
@@ -33,6 +33,7 @@ | |||
33 | #include <linux/rcupdate.h> | 33 | #include <linux/rcupdate.h> |
34 | #include <linux/interrupt.h> | 34 | #include <linux/interrupt.h> |
35 | #include <linux/sched.h> | 35 | #include <linux/sched.h> |
36 | #include <uapi/linux/sched/types.h> | ||
36 | #include <linux/atomic.h> | 37 | #include <linux/atomic.h> |
37 | #include <linux/bitops.h> | 38 | #include <linux/bitops.h> |
38 | #include <linux/completion.h> | 39 | #include <linux/completion.h> |
diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c index cb62ce23ffc7..e456327a63d6 100644 --- a/kernel/rcu/tree.c +++ b/kernel/rcu/tree.c | |||
@@ -49,6 +49,7 @@ | |||
49 | #include <linux/kernel_stat.h> | 49 | #include <linux/kernel_stat.h> |
50 | #include <linux/wait.h> | 50 | #include <linux/wait.h> |
51 | #include <linux/kthread.h> | 51 | #include <linux/kthread.h> |
52 | #include <uapi/linux/sched/types.h> | ||
52 | #include <linux/prefetch.h> | 53 | #include <linux/prefetch.h> |
53 | #include <linux/delay.h> | 54 | #include <linux/delay.h> |
54 | #include <linux/stop_machine.h> | 55 | #include <linux/stop_machine.h> |
diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h index a240f3308be6..9dabb04003be 100644 --- a/kernel/rcu/tree_plugin.h +++ b/kernel/rcu/tree_plugin.h | |||
@@ -28,6 +28,7 @@ | |||
28 | #include <linux/gfp.h> | 28 | #include <linux/gfp.h> |
29 | #include <linux/oom.h> | 29 | #include <linux/oom.h> |
30 | #include <linux/smpboot.h> | 30 | #include <linux/smpboot.h> |
31 | #include <uapi/linux/sched/types.h> | ||
31 | #include "../time/tick-internal.h" | 32 | #include "../time/tick-internal.h" |
32 | 33 | ||
33 | #ifdef CONFIG_RCU_BOOST | 34 | #ifdef CONFIG_RCU_BOOST |
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 1a7fd3d21e5a..ed39d1d0b64a 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c | |||
@@ -7,6 +7,7 @@ | |||
7 | */ | 7 | */ |
8 | #include <linux/sched.h> | 8 | #include <linux/sched.h> |
9 | #include <linux/sched/clock.h> | 9 | #include <linux/sched/clock.h> |
10 | #include <uapi/linux/sched/types.h> | ||
10 | #include <linux/cpuset.h> | 11 | #include <linux/cpuset.h> |
11 | #include <linux/delayacct.h> | 12 | #include <linux/delayacct.h> |
12 | #include <linux/init_task.h> | 13 | #include <linux/init_task.h> |
diff --git a/kernel/sched/cpufreq_schedutil.c b/kernel/sched/cpufreq_schedutil.c index fd4659313640..8f8de3d4d6b7 100644 --- a/kernel/sched/cpufreq_schedutil.c +++ b/kernel/sched/cpufreq_schedutil.c | |||
@@ -13,6 +13,7 @@ | |||
13 | 13 | ||
14 | #include <linux/cpufreq.h> | 14 | #include <linux/cpufreq.h> |
15 | #include <linux/kthread.h> | 15 | #include <linux/kthread.h> |
16 | #include <uapi/linux/sched/types.h> | ||
16 | #include <linux/slab.h> | 17 | #include <linux/slab.h> |
17 | #include <trace/events/power.h> | 18 | #include <trace/events/power.h> |
18 | 19 | ||
diff --git a/kernel/trace/ring_buffer_benchmark.c b/kernel/trace/ring_buffer_benchmark.c index 6df9a83e20d7..c190a4d5013c 100644 --- a/kernel/trace/ring_buffer_benchmark.c +++ b/kernel/trace/ring_buffer_benchmark.c | |||
@@ -6,6 +6,7 @@ | |||
6 | #include <linux/ring_buffer.h> | 6 | #include <linux/ring_buffer.h> |
7 | #include <linux/completion.h> | 7 | #include <linux/completion.h> |
8 | #include <linux/kthread.h> | 8 | #include <linux/kthread.h> |
9 | #include <uapi/linux/sched/types.h> | ||
9 | #include <linux/module.h> | 10 | #include <linux/module.h> |
10 | #include <linux/ktime.h> | 11 | #include <linux/ktime.h> |
11 | #include <asm/local.h> | 12 | #include <asm/local.h> |
diff --git a/kernel/trace/trace_selftest.c b/kernel/trace/trace_selftest.c index b0f86ea77881..cb917cebae29 100644 --- a/kernel/trace/trace_selftest.c +++ b/kernel/trace/trace_selftest.c | |||
@@ -1,5 +1,6 @@ | |||
1 | /* Include in trace.c */ | 1 | /* Include in trace.c */ |
2 | 2 | ||
3 | #include <uapi/linux/sched/types.h> | ||
3 | #include <linux/stringify.h> | 4 | #include <linux/stringify.h> |
4 | #include <linux/kthread.h> | 5 | #include <linux/kthread.h> |
5 | #include <linux/delay.h> | 6 | #include <linux/delay.h> |
diff --git a/kernel/watchdog.c b/kernel/watchdog.c index 144d7b1b0364..52718f4512e9 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <linux/sysctl.h> | 19 | #include <linux/sysctl.h> |
20 | #include <linux/smpboot.h> | 20 | #include <linux/smpboot.h> |
21 | #include <linux/sched/rt.h> | 21 | #include <linux/sched/rt.h> |
22 | #include <uapi/linux/sched/types.h> | ||
22 | #include <linux/tick.h> | 23 | #include <linux/tick.h> |
23 | #include <linux/workqueue.h> | 24 | #include <linux/workqueue.h> |
24 | #include <linux/sched/clock.h> | 25 | #include <linux/sched/clock.h> |