sched/headers: Prepare for new header dependencies before moving code to <linux/sched...

We are going to split <linux/sched/user.h> out of <linux/sched.h>, which
will have to be picked up from other headers and a couple of .c files.

Create a trivial placeholder <linux/sched/user.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>

diff --git a/block/ioprio.c b/block/ioprio.c
index 3790669232ff5066175a2033ebd418a7c5a83f53..89c43e07787dfb18b342934c3fcfc4d2dae23745 100644 (file)
--- a/block/ioprio.c
+++ b/block/ioprio.c
@@ -25,6 +25,7 @@
 #include <linux/ioprio.h>
 #include <linux/blkdev.h>
 #include <linux/capability.h>
+#include <linux/sched/user.h>
 #include <linux/syscalls.h>
 #include <linux/security.h>
 #include <linux/pid_namespace.h>

diff --git a/include/linux/cred.h b/include/linux/cred.h
index f0e70a1bb3acfe784148ba468a3577d23065a9a7..045d33e480694c56b59c8c982ca95f16d8b071cf 100644 (file)
--- a/include/linux/cred.h
+++ b/include/linux/cred.h
@@ -18,8 +18,8 @@
 #include <linux/selinux.h>
 #include <linux/atomic.h>
 #include <linux/uidgid.h>
+#include <linux/sched/user.h>
 
-struct user_struct;
 struct cred;
 struct inode;
 

diff --git a/include/linux/sched/user.h b/include/linux/sched/user.h
new file mode 100644 (file)
index 0000000..83238e5
--- /dev/null
+++ b/include/linux/sched/user.h
@@ -0,0 +1,6 @@
+#ifndef _LINUX_SCHED_USER_H
+#define _LINUX_SCHED_USER_H
+
+#include <linux/sched.h>
+
+#endif /* _LINUX_SCHED_USER_H */

diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index 4f7241fbeff34c136a76bfa6ba43cf7d402116fb..e8d41ff57241d86e6c2aa0c46e6408897491256e 100644 (file)
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -37,6 +37,7 @@
 #include <linux/slab.h>
 #include <linux/sched/wake_q.h>
 #include <linux/sched/signal.h>
+#include <linux/sched/user.h>
 
 #include <net/sock.h>
 #include "util.h"

diff --git a/kernel/fork.c b/kernel/fork.c
index 7332448b668a28ec33cece043e043de8a981650a..a5ad1e4ab604dfac8c132c7cdb48fa6d8dcaaf07 100644 (file)
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -15,6 +15,7 @@
 #include <linux/sched/autogroup.h>
 #include <linux/sched/mm.h>
 #include <linux/sched/coredump.h>
+#include <linux/sched/user.h>
 #include <linux/init.h>
 #include <linux/unistd.h>
 #include <linux/module.h>

diff --git a/kernel/signal.c b/kernel/signal.c
index bae358532d0aee309e1a7a83b1fabd0386f6e5f7..762fcf64f0c349d7b3fe33aa12c32babc8f0bbca 100644 (file)
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -14,6 +14,7 @@
 #include <linux/export.h>
 #include <linux/init.h>
 #include <linux/sched.h>
+#include <linux/sched/user.h>
 #include <linux/fs.h>
 #include <linux/tty.h>
 #include <linux/binfmts.h>

diff --git a/kernel/user.c b/kernel/user.c
index b069ccbfb0b0375b5ab03445472f2679d6981bbf..00281add65b251d484616264dbba8df8b0ae066d 100644 (file)
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -13,6 +13,7 @@
 #include <linux/slab.h>
 #include <linux/bitops.h>
 #include <linux/key.h>
+#include <linux/sched/user.h>
 #include <linux/interrupt.h>
 #include <linux/export.h>
 #include <linux/user_namespace.h>

diff --git a/mm/mlock.c b/mm/mlock.c
index cdbed8aaa4268c94abb44a8adf6c93873d37856a..1050511f8b2bdbfbd55a69b8fcfc41ea6cd51b72 100644 (file)
--- a/mm/mlock.c
+++ b/mm/mlock.c
@@ -8,6 +8,7 @@
 #include <linux/capability.h>
 #include <linux/mman.h>
 #include <linux/mm.h>
+#include <linux/sched/user.h>
 #include <linux/swap.h>
 #include <linux/swapops.h>
 #include <linux/pagemap.h>

diff --git a/net/core/scm.c b/net/core/scm.c
index b6d83686e1496d945ce5362908e7699fb98ea10e..b1ff8a4417489f7c211b4bddd2d07de1caf19cfd 100644 (file)
--- a/net/core/scm.c
+++ b/net/core/scm.c
@@ -14,6 +14,7 @@
 #include <linux/capability.h>
 #include <linux/errno.h>
 #include <linux/sched.h>
+#include <linux/sched/user.h>
 #include <linux/mm.h>
 #include <linux/kernel.h>
 #include <linux/stat.h>

diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c
index 918cddcd4516aef4fd4ba7719b6ad01c69fd039d..b6fdd22205b169b663cdb00aecd5d214c7a376dd 100644 (file)
--- a/security/keys/process_keys.c
+++ b/security/keys/process_keys.c
@@ -12,6 +12,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/sched.h>
+#include <linux/sched/user.h>
 #include <linux/keyctl.h>
 #include <linux/fs.h>
 #include <linux/err.h>