2 files changed, 31 insertions, 26 deletions
diff --git a/include/linux/security.h b/include/linux/security.h
index 2fefad6d27a0..339b3b120f6c 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -22,22 +22,36 @@
 #ifndef __LINUX_SECURITY_H
 #define __LINUX_SECURITY_H
-#include <linux/fs.h>
-#include <linux/fsnotify.h>
-#include <linux/binfmts.h>
-#include <linux/dcache.h>
-#include <linux/signal.h>
-#include <linux/resource.h>
-#include <linux/sem.h>
-#include <linux/shm.h>
-#include <linux/mm.h> /* PAGE_ALIGN */
-#include <linux/msg.h>
-#include <linux/sched.h>
 #include <linux/key.h>
-#include <linux/xfrm.h>
+#include <linux/capability.h>
 #include <linux/slab.h>
-#include <linux/xattr.h>
+#include <linux/err.h>
-#include <net/flow.h>
+struct linux_binprm;
+struct cred;
+struct rlimit;
+struct siginfo;
+struct sem_array;
+struct sembuf;
+struct kern_ipc_perm;
+struct audit_context;
+struct super_block;
+struct inode;
+struct dentry;
+struct file;
+struct vfsmount;
+struct path;
+struct qstr;
+struct nameidata;
+struct iattr;
+struct fown_struct;
+struct file_operations;
+struct shmid_kernel;
+struct msg_msg;
+struct msg_queue;
+struct xattr;
+struct xfrm_sec_ctx;
+struct mm_struct;
 /* Maximum number of letters for an LSM name string */
 #define SECURITY_NAME_MAX       10
@@ -49,6 +63,7 @@
 struct ctl_table;
 struct audit_krule;
 struct user_namespace;
+struct timezone;
 /*
 * These functions are in security/capability.c and are used
@@ -131,18 +146,6 @@ struct request_sock;
 #define LSM_UNSAFE_PTRACE_CAP   4
 #ifdef CONFIG_MMU
-/*
- * If a hint addr is less than mmap_min_addr change hint to be as
- * low as possible but still greater than mmap_min_addr
- */
-static inline unsigned long round_hint_to_min(unsigned long hint)
-{
-        hint &= PAGE_MASK;
-        if (((void *)hint != NULL) &&
-            (hint < mmap_min_addr))
-                return PAGE_ALIGN(mmap_min_addr);
-        return hint;
-}
 extern int mmap_min_addr_handler(struct ctl_table *table, int write,
                                 void __user *buffer, size_t *lenp, loff_t *ppos);
 #endif
diff --git a/include/net/sock.h b/include/net/sock.h
index 91c1c8baf020..27508f07eada 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -56,6 +56,8 @@
 #include <linux/memcontrol.h>
 #include <linux/res_counter.h>
 #include <linux/jump_label.h>
+#include <linux/aio.h>
+#include <linux/sched.h>
 #include <linux/filter.h>
 #include <linux/rculist_nulls.h>

diff --git a/include/linux/security.h b/include/linux/security.h index 2fefad6d27a0..339b3b120f6c 100644 --- a/include/linux/security.h +++ b/include/linux/security.h
@@ -22,22 +22,36 @@
22	#ifndef __LINUX_SECURITY_H	22	#ifndef __LINUX_SECURITY_H
23	#define __LINUX_SECURITY_H	23	#define __LINUX_SECURITY_H
24		24
25	#include <linux/fs.h>
26	#include <linux/fsnotify.h>
27	#include <linux/binfmts.h>
28	#include <linux/dcache.h>
29	#include <linux/signal.h>
30	#include <linux/resource.h>
31	#include <linux/sem.h>
32	#include <linux/shm.h>
33	#include <linux/mm.h> /* PAGE_ALIGN */
34	#include <linux/msg.h>
35	#include <linux/sched.h>
36	#include <linux/key.h>	25	#include <linux/key.h>
37	#include <linux/xfrm.h>	26	#include <linux/capability.h>
38	#include <linux/slab.h>	27	#include <linux/slab.h>
39	#include <linux/xattr.h>	28	#include <linux/err.h>
40	#include <net/flow.h>	29
		30	struct linux_binprm;
		31	struct cred;
		32	struct rlimit;
		33	struct siginfo;
		34	struct sem_array;
		35	struct sembuf;
		36	struct kern_ipc_perm;
		37	struct audit_context;
		38	struct super_block;
		39	struct inode;
		40	struct dentry;
		41	struct file;
		42	struct vfsmount;
		43	struct path;
		44	struct qstr;
		45	struct nameidata;
		46	struct iattr;
		47	struct fown_struct;
		48	struct file_operations;
		49	struct shmid_kernel;
		50	struct msg_msg;
		51	struct msg_queue;
		52	struct xattr;
		53	struct xfrm_sec_ctx;
		54	struct mm_struct;
41		55
42	/* Maximum number of letters for an LSM name string */	56	/* Maximum number of letters for an LSM name string */
43	#define SECURITY_NAME_MAX 10	57	#define SECURITY_NAME_MAX 10
@@ -49,6 +63,7 @@
49	struct ctl_table;	63	struct ctl_table;
50	struct audit_krule;	64	struct audit_krule;
51	struct user_namespace;	65	struct user_namespace;
		66	struct timezone;
52		67
53	/*	68	/*
54	* These functions are in security/capability.c and are used	69	* These functions are in security/capability.c and are used
@@ -131,18 +146,6 @@ struct request_sock;
131	#define LSM_UNSAFE_PTRACE_CAP 4	146	#define LSM_UNSAFE_PTRACE_CAP 4
132		147
133	#ifdef CONFIG_MMU	148	#ifdef CONFIG_MMU
134	/*
135	* If a hint addr is less than mmap_min_addr change hint to be as
136	* low as possible but still greater than mmap_min_addr
137	*/
138	static inline unsigned long round_hint_to_min(unsigned long hint)
139	{
140	hint &= PAGE_MASK;
141	if (((void *)hint != NULL) &&
142	(hint < mmap_min_addr))
143	return PAGE_ALIGN(mmap_min_addr);
144	return hint;
145	}
146	extern int mmap_min_addr_handler(struct ctl_table *table, int write,	149	extern int mmap_min_addr_handler(struct ctl_table *table, int write,
147	void __user buffer, size_t lenp, loff_t *ppos);	150	void __user buffer, size_t lenp, loff_t *ppos);
148	#endif	151	#endif


diff --git a/include/net/sock.h b/include/net/sock.h index 91c1c8baf020..27508f07eada 100644 --- a/include/net/sock.h +++ b/include/net/sock.h
@@ -56,6 +56,8 @@
56	#include <linux/memcontrol.h>	56	#include <linux/memcontrol.h>
57	#include <linux/res_counter.h>	57	#include <linux/res_counter.h>
58	#include <linux/jump_label.h>	58	#include <linux/jump_label.h>
		59	#include <linux/aio.h>
		60	#include <linux/sched.h>
59		61
60	#include <linux/filter.h>	62	#include <linux/filter.h>
61	#include <linux/rculist_nulls.h>	63	#include <linux/rculist_nulls.h>