[PATCH 07/12] headers: fs.h vs perf_event.h

[Alexey Dobriyan]

---
 drivers/misc/kgdbts.c      | 1 +
 include/linux/perf_event.h | 3 ++-
 kernel/capability.c        | 1 +
 kernel/groups.c            | 1 +
 kernel/nsproxy.c           | 1 +
 kernel/uid16.c             | 1 +
 security/keys/compat.c     | 1 +
 virt/kvm/eventfd.c         | 1 +
 8 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
index 36f5d52..79d1960 100644
--- a/drivers/misc/kgdbts.c
+++ b/drivers/misc/kgdbts.c
@@ -94,6 +94,7 @@
  *
  */
 
+#include <linux/fs.h>
 #include <linux/kernel.h>
 #include <linux/kgdb.h>
 #include <linux/ctype.h>
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 707617a..b4e5214 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -41,7 +41,6 @@ struct perf_guest_info_callbacks {
 #include <linux/rcupdate.h>
 #include <linux/spinlock.h>
 #include <linux/hrtimer.h>
-#include <linux/fs.h>
 #include <linux/pid_namespace.h>
 #include <linux/workqueue.h>
 #include <linux/ftrace.h>
@@ -54,6 +53,8 @@ struct perf_guest_info_callbacks {
 #include <linux/perf_regs.h>
 #include <asm/local.h>
 
+struct fasync_struct;
+
 struct perf_callchain_entry {
 	__u64				nr;
 	__u64				ip[PERF_MAX_STACK_DEPTH];
diff --git a/kernel/capability.c b/kernel/capability.c
index a5cf13c..6069e21 100644
--- a/kernel/capability.c
+++ b/kernel/capability.c
@@ -11,6 +11,7 @@
 
 #include <linux/audit.h>
 #include <linux/capability.h>
+#include <linux/fs.h>
 #include <linux/mm.h>
 #include <linux/export.h>
 #include <linux/security.h>
diff --git a/kernel/groups.c b/kernel/groups.c
index 451698f..a324d8f 100644
--- a/kernel/groups.c
+++ b/kernel/groups.c
@@ -7,6 +7,7 @@
 #include <linux/security.h>
 #include <linux/syscalls.h>
 #include <asm/uaccess.h>
+#include <uapi/linux/limits.h>
 
 /* init to 2 - one for init_task, one to ensure it is never freed */
 struct group_info init_groups = { .usage = ATOMIC_INIT(2) };
diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
index 8e78110..341d958 100644
--- a/kernel/nsproxy.c
+++ b/kernel/nsproxy.c
@@ -13,6 +13,7 @@
  *             Pavel Emelianov <xemul@xxxxxxxxxx>
  */
 
+#include <linux/fs.h>
 #include <linux/slab.h>
 #include <linux/export.h>
 #include <linux/nsproxy.h>
diff --git a/kernel/uid16.c b/kernel/uid16.c
index 602e5bb..bc92778 100644
--- a/kernel/uid16.c
+++ b/kernel/uid16.c
@@ -13,6 +13,7 @@
 #include <linux/highuid.h>
 #include <linux/security.h>
 #include <linux/syscalls.h>
+#include <uapi/linux/limits.h>
 
 #include <asm/uaccess.h>
 
diff --git a/security/keys/compat.c b/security/keys/compat.c
index 3478965..3d12bd9 100644
--- a/security/keys/compat.c
+++ b/security/keys/compat.c
@@ -9,6 +9,7 @@
  * 2 of the License, or (at your option) any later version.
  */
 
+#include <linux/fs.h>
 #include <linux/syscalls.h>
 #include <linux/keyctl.h>
 #include <linux/compat.h>
diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c
index 20c3af7..9fdb172 100644
--- a/virt/kvm/eventfd.c
+++ b/virt/kvm/eventfd.c
@@ -28,6 +28,7 @@
 #include <linux/wait.h>
 #include <linux/poll.h>
 #include <linux/file.h>
+#include <linux/fs.h>
 #include <linux/list.h>
 #include <linux/eventfd.h>
 #include <linux/kernel.h>
-- 
1.8.5.5


--u3/rZRmxL6MmkK24
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="0008-headers-fs.h-vs-usb.h.patch"