summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-02-06 04:57:33 -0500
committerIngo Molnar <mingo@kernel.org>2017-03-02 02:42:38 -0500
commitf719ff9bcee2a422647790f12d53d3755f47c727 (patch)
tree187d191f5459fcb23a86ca399d3b630bfa46417b
parentb2d091031075ac9a1598e3cc3a29c28f02e64c0d (diff)
sched/headers: Prepare to move the task_lock()/unlock() APIs to <linux/sched/task.h>
But first update the code that uses these facilities with the new header. 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>
-rw-r--r--arch/mips/math-emu/dsemul.c1
-rw-r--r--block/blk-ioc.c1
-rw-r--r--block/ioprio.c1
-rw-r--r--drivers/staging/android/ion/ion.c1
-rw-r--r--drivers/staging/lustre/lustre/ptlrpc/sec.c1
-rw-r--r--fs/proc/internal.h1
-rw-r--r--fs/proc/proc_net.c1
-rw-r--r--fs/proc_namespace.c2
-rw-r--r--include/linux/cpuset.h1
-rw-r--r--ipc/namespace.c1
-rw-r--r--kernel/cgroup/cpuset.c1
-rw-r--r--kernel/sched/debug.c1
-rw-r--r--kernel/utsname.c1
-rw-r--r--mm/mempolicy.c1
-rw-r--r--mm/mmu_context.c1
-rw-r--r--net/core/net_namespace.c2
-rw-r--r--net/core/netclassid_cgroup.c2
-rw-r--r--net/core/netprio_cgroup.c2
18 files changed, 22 insertions, 0 deletions
diff --git a/arch/mips/math-emu/dsemul.c b/arch/mips/math-emu/dsemul.c
index 6664908514b3..b6bfd3625369 100644
--- a/arch/mips/math-emu/dsemul.c
+++ b/arch/mips/math-emu/dsemul.c
@@ -1,6 +1,7 @@
1#include <linux/err.h> 1#include <linux/err.h>
2#include <linux/slab.h> 2#include <linux/slab.h>
3#include <linux/mm_types.h> 3#include <linux/mm_types.h>
4#include <linux/sched/task.h>
4 5
5#include <asm/branch.h> 6#include <asm/branch.h>
6#include <asm/cacheflush.h> 7#include <asm/cacheflush.h>
diff --git a/block/blk-ioc.c b/block/blk-ioc.c
index b12f9c87b4c3..6bfa39675337 100644
--- a/block/blk-ioc.c
+++ b/block/blk-ioc.c
@@ -7,6 +7,7 @@
7#include <linux/bio.h> 7#include <linux/bio.h>
8#include <linux/blkdev.h> 8#include <linux/blkdev.h>
9#include <linux/slab.h> 9#include <linux/slab.h>
10#include <linux/sched/task.h>
10 11
11#include "blk.h" 12#include "blk.h"
12 13
diff --git a/block/ioprio.c b/block/ioprio.c
index 4b9ab8367dda..0c47a00f92a8 100644
--- a/block/ioprio.c
+++ b/block/ioprio.c
@@ -27,6 +27,7 @@
27#include <linux/blkdev.h> 27#include <linux/blkdev.h>
28#include <linux/capability.h> 28#include <linux/capability.h>
29#include <linux/sched/user.h> 29#include <linux/sched/user.h>
30#include <linux/sched/task.h>
30#include <linux/syscalls.h> 31#include <linux/syscalls.h>
31#include <linux/security.h> 32#include <linux/security.h>
32#include <linux/pid_namespace.h> 33#include <linux/pid_namespace.h>
diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
index 2c3ffbcbd621..f45115fce4eb 100644
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -36,6 +36,7 @@
36#include <linux/debugfs.h> 36#include <linux/debugfs.h>
37#include <linux/dma-buf.h> 37#include <linux/dma-buf.h>
38#include <linux/idr.h> 38#include <linux/idr.h>
39#include <linux/sched/task.h>
39 40
40#include "ion.h" 41#include "ion.h"
41#include "ion_priv.h" 42#include "ion_priv.h"
diff --git a/drivers/staging/lustre/lustre/ptlrpc/sec.c b/drivers/staging/lustre/lustre/ptlrpc/sec.c
index 49f34fd655c3..366f2ce20f5e 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/sec.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/sec.c
@@ -40,6 +40,7 @@
40#include <linux/crypto.h> 40#include <linux/crypto.h>
41#include <linux/cred.h> 41#include <linux/cred.h>
42#include <linux/key.h> 42#include <linux/key.h>
43#include <linux/sched/task.h>
43 44
44#include "../include/obd.h" 45#include "../include/obd.h"
45#include "../include/obd_class.h" 46#include "../include/obd_class.h"
diff --git a/fs/proc/internal.h b/fs/proc/internal.h
index 550e8b183abe..26a6daf02185 100644
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
@@ -15,6 +15,7 @@
15#include <linux/atomic.h> 15#include <linux/atomic.h>
16#include <linux/binfmts.h> 16#include <linux/binfmts.h>
17#include <linux/sched/coredump.h> 17#include <linux/sched/coredump.h>
18#include <linux/sched/task.h>
18 19
19struct ctl_table_header; 20struct ctl_table_header;
20struct mempolicy; 21struct mempolicy;
diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
index ffd72a6c6e04..5cbc65d7a1e1 100644
--- a/fs/proc/proc_net.c
+++ b/fs/proc/proc_net.c
@@ -17,6 +17,7 @@
17#include <linux/slab.h> 17#include <linux/slab.h>
18#include <linux/init.h> 18#include <linux/init.h>
19#include <linux/sched.h> 19#include <linux/sched.h>
20#include <linux/sched/task.h>
20#include <linux/module.h> 21#include <linux/module.h>
21#include <linux/bitops.h> 22#include <linux/bitops.h>
22#include <linux/mount.h> 23#include <linux/mount.h>
diff --git a/fs/proc_namespace.c b/fs/proc_namespace.c
index 3f1190d18991..b5713fefb4c1 100644
--- a/fs/proc_namespace.c
+++ b/fs/proc_namespace.c
@@ -10,6 +10,8 @@
10#include <linux/nsproxy.h> 10#include <linux/nsproxy.h>
11#include <linux/security.h> 11#include <linux/security.h>
12#include <linux/fs_struct.h> 12#include <linux/fs_struct.h>
13#include <linux/sched/task.h>
14
13#include "proc/internal.h" /* only for get_proc_task() in ->open() */ 15#include "proc/internal.h" /* only for get_proc_task() in ->open() */
14 16
15#include "pnode.h" 17#include "pnode.h"
diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h
index c608c39cb161..611fce58d670 100644
--- a/include/linux/cpuset.h
+++ b/include/linux/cpuset.h
@@ -10,6 +10,7 @@
10 10
11#include <linux/sched.h> 11#include <linux/sched.h>
12#include <linux/sched/topology.h> 12#include <linux/sched/topology.h>
13#include <linux/sched/task.h>
13#include <linux/cpumask.h> 14#include <linux/cpumask.h>
14#include <linux/nodemask.h> 15#include <linux/nodemask.h>
15#include <linux/mm.h> 16#include <linux/mm.h>
diff --git a/ipc/namespace.c b/ipc/namespace.c
index 1f1d713ac19c..b4d80f9f7246 100644
--- a/ipc/namespace.c
+++ b/ipc/namespace.c
@@ -14,6 +14,7 @@
14#include <linux/mount.h> 14#include <linux/mount.h>
15#include <linux/user_namespace.h> 15#include <linux/user_namespace.h>
16#include <linux/proc_ns.h> 16#include <linux/proc_ns.h>
17#include <linux/sched/task.h>
17 18
18#include "util.h" 19#include "util.h"
19 20
diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c
index a5c46db2855c..0f41292be0fb 100644
--- a/kernel/cgroup/cpuset.c
+++ b/kernel/cgroup/cpuset.c
@@ -45,6 +45,7 @@
45#include <linux/rcupdate.h> 45#include <linux/rcupdate.h>
46#include <linux/sched.h> 46#include <linux/sched.h>
47#include <linux/sched/mm.h> 47#include <linux/sched/mm.h>
48#include <linux/sched/task.h>
48#include <linux/seq_file.h> 49#include <linux/seq_file.h>
49#include <linux/security.h> 50#include <linux/security.h>
50#include <linux/slab.h> 51#include <linux/slab.h>
diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c
index e865d8bfb881..38f019324f1a 100644
--- a/kernel/sched/debug.c
+++ b/kernel/sched/debug.c
@@ -12,6 +12,7 @@
12 12
13#include <linux/proc_fs.h> 13#include <linux/proc_fs.h>
14#include <linux/sched/mm.h> 14#include <linux/sched/mm.h>
15#include <linux/sched/task.h>
15#include <linux/seq_file.h> 16#include <linux/seq_file.h>
16#include <linux/kallsyms.h> 17#include <linux/kallsyms.h>
17#include <linux/utsname.h> 18#include <linux/utsname.h>
diff --git a/kernel/utsname.c b/kernel/utsname.c
index 06585ad296ff..913fe4336d2b 100644
--- a/kernel/utsname.c
+++ b/kernel/utsname.c
@@ -17,6 +17,7 @@
17#include <linux/cred.h> 17#include <linux/cred.h>
18#include <linux/user_namespace.h> 18#include <linux/user_namespace.h>
19#include <linux/proc_ns.h> 19#include <linux/proc_ns.h>
20#include <linux/sched/task.h>
20 21
21static struct ucounts *inc_uts_namespaces(struct user_namespace *ns) 22static struct ucounts *inc_uts_namespaces(struct user_namespace *ns)
22{ 23{
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 18e0105810df..75b2745bac41 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -75,6 +75,7 @@
75#include <linux/sched.h> 75#include <linux/sched.h>
76#include <linux/sched/mm.h> 76#include <linux/sched/mm.h>
77#include <linux/sched/numa_balancing.h> 77#include <linux/sched/numa_balancing.h>
78#include <linux/sched/task.h>
78#include <linux/nodemask.h> 79#include <linux/nodemask.h>
79#include <linux/cpuset.h> 80#include <linux/cpuset.h>
80#include <linux/slab.h> 81#include <linux/slab.h>
diff --git a/mm/mmu_context.c b/mm/mmu_context.c
index 8888b124a386..3e612ae748e9 100644
--- a/mm/mmu_context.c
+++ b/mm/mmu_context.c
@@ -6,6 +6,7 @@
6#include <linux/mm.h> 6#include <linux/mm.h>
7#include <linux/sched.h> 7#include <linux/sched.h>
8#include <linux/sched/mm.h> 8#include <linux/sched/mm.h>
9#include <linux/sched/task.h>
9#include <linux/mmu_context.h> 10#include <linux/mmu_context.h>
10#include <linux/export.h> 11#include <linux/export.h>
11 12
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
index 3c4bbec39713..652468ff65b7 100644
--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
@@ -16,6 +16,8 @@
16#include <linux/export.h> 16#include <linux/export.h>
17#include <linux/user_namespace.h> 17#include <linux/user_namespace.h>
18#include <linux/net_namespace.h> 18#include <linux/net_namespace.h>
19#include <linux/sched/task.h>
20
19#include <net/sock.h> 21#include <net/sock.h>
20#include <net/netlink.h> 22#include <net/netlink.h>
21#include <net/net_namespace.h> 23#include <net/net_namespace.h>
diff --git a/net/core/netclassid_cgroup.c b/net/core/netclassid_cgroup.c
index 11fce17274f6..6ae56037bb13 100644
--- a/net/core/netclassid_cgroup.c
+++ b/net/core/netclassid_cgroup.c
@@ -12,6 +12,8 @@
12#include <linux/slab.h> 12#include <linux/slab.h>
13#include <linux/cgroup.h> 13#include <linux/cgroup.h>
14#include <linux/fdtable.h> 14#include <linux/fdtable.h>
15#include <linux/sched/task.h>
16
15#include <net/cls_cgroup.h> 17#include <net/cls_cgroup.h>
16#include <net/sock.h> 18#include <net/sock.h>
17 19
diff --git a/net/core/netprio_cgroup.c b/net/core/netprio_cgroup.c
index 756637dc7a57..0f9275ee5595 100644
--- a/net/core/netprio_cgroup.c
+++ b/net/core/netprio_cgroup.c
@@ -20,6 +20,8 @@
20#include <linux/cgroup.h> 20#include <linux/cgroup.h>
21#include <linux/rcupdate.h> 21#include <linux/rcupdate.h>
22#include <linux/atomic.h> 22#include <linux/atomic.h>
23#include <linux/sched/task.h>
24
23#include <net/rtnetlink.h> 25#include <net/rtnetlink.h>
24#include <net/pkt_cls.h> 26#include <net/pkt_cls.h>
25#include <net/sock.h> 27#include <net/sock.h>