>From 28e18cbfcb31131ae67792d7de8f97012ae3bcc3 Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Fri, 20 Jun 2014 23:55:48 +0300
Subject: [PATCH 01/12] headers: -proc_fs.h

---
 drivers/acpi/apei/erst-dbg.c        | 1 +
 drivers/char/ipmi/ipmi_si_intf.c    | 1 +
 drivers/ide/ide-cd.c                | 1 +
 drivers/ide/ide-disk_proc.c         | 1 +
 drivers/ide/ide-floppy_proc.c       | 1 +
 drivers/ide/ide-tape.c              | 1 +
 drivers/platform/x86/dell-smo8800.c | 1 +
 drivers/staging/panel/panel.c       | 1 +
 drivers/staging/rtl8192ee/debug.c   | 2 ++
 drivers/staging/rtl8821ae/debug.c   | 2 ++
 fs/nfs/client.c                     | 1 +
 fs/nfsd/export.h                    | 1 +
 fs/nfsd/netns.h                     | 1 +
 fs/nfsd/nfsctl.c                    | 1 +
 fs/nfsd/nfsfh.h                     | 1 +
 fs/nfsd/stats.c                     | 1 +
 include/acpi/acpi_bus.h             | 2 +-
 include/linux/atmdev.h              | 2 +-
 include/linux/crash_dump.h          | 1 -
 include/linux/efi.h                 | 1 -
 include/linux/ide.h                 | 2 +-
 include/linux/ipmi.h                | 1 -
 include/linux/ipmi_smi.h            | 1 -
 include/linux/parport.h             | 1 -
 include/linux/posix_acl.h           | 1 +
 include/linux/sunrpc/cache.h        | 3 ++-
 include/linux/sunrpc/rpc_pipe_fs.h  | 1 +
 include/linux/sunrpc/stats.h        | 2 +-
 include/net/netns/netfilter.h       | 2 +-
 include/net/sctp/sctp.h             | 1 -
 net/atm/br2684.c                    | 1 +
 net/netfilter/nf_synproxy_core.c    | 1 +
 net/sctp/objcnt.c                   | 1 +
 net/sctp/proc.c                     | 1 +
 net/sctp/protocol.c                 | 1 +
 net/sunrpc/auth_gss/svcauth_gss.c   | 1 +
 36 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/drivers/acpi/apei/erst-dbg.c b/drivers/acpi/apei/erst-dbg.c
index 04ab5c9..a080011 100644
--- a/drivers/acpi/apei/erst-dbg.c
+++ b/drivers/acpi/apei/erst-dbg.c
@@ -23,6 +23,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include <linux/fs.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/uaccess.h>
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 5d66568..9347146 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -50,6 +50,7 @@
 #include <linux/delay.h>
 #include <linux/list.h>
 #include <linux/pci.h>
+#include <linux/proc_fs.h>
 #include <linux/ioport.h>
 #include <linux/notifier.h>
 #include <linux/mutex.h>
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 0b510ba..503de27 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -30,6 +30,7 @@
 #include <linux/kernel.h>
 #include <linux/delay.h>
 #include <linux/timer.h>
+#include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
diff --git a/drivers/ide/ide-disk_proc.c b/drivers/ide/ide-disk_proc.c
index 0d1fae6..39f6f42 100644
--- a/drivers/ide/ide-disk_proc.c
+++ b/drivers/ide/ide-disk_proc.c
@@ -2,6 +2,7 @@
 #include <linux/ide.h>
 #include <linux/slab.h>
 #include <linux/export.h>
+#include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 
 #include "ide-disk.h"
diff --git a/drivers/ide/ide-floppy_proc.c b/drivers/ide/ide-floppy_proc.c
index e7a25ea..cd05445 100644
--- a/drivers/ide/ide-floppy_proc.c
+++ b/drivers/ide/ide-floppy_proc.c
@@ -1,6 +1,7 @@
 #include <linux/kernel.h>
 #include <linux/export.h>
 #include <linux/ide.h>
+#include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 
 #include "ide-floppy.h"
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 1793aea..775c95c 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -31,6 +31,7 @@
 #include <linux/major.h>
 #include <linux/errno.h>
 #include <linux/genhd.h>
+#include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/slab.h>
 #include <linux/pci.h>
diff --git a/drivers/platform/x86/dell-smo8800.c b/drivers/platform/x86/dell-smo8800.c
index a653716..8c26c6e 100644
--- a/drivers/platform/x86/dell-smo8800.c
+++ b/drivers/platform/x86/dell-smo8800.c
@@ -19,6 +19,7 @@
 
 #define DRIVER_NAME "smo8800"
 
+#include <linux/fs.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/acpi.h>
diff --git a/drivers/staging/panel/panel.c b/drivers/staging/panel/panel.c
index 4e92293..03fbb8e 100644
--- a/drivers/staging/panel/panel.c
+++ b/drivers/staging/panel/panel.c
@@ -36,6 +36,7 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
+#include <linux/fs.h>
 #include <linux/module.h>
 
 #include <linux/types.h>
diff --git a/drivers/staging/rtl8192ee/debug.c b/drivers/staging/rtl8192ee/debug.c
index feec394..73c1407 100644
--- a/drivers/staging/rtl8192ee/debug.c
+++ b/drivers/staging/rtl8192ee/debug.c
@@ -23,6 +23,8 @@
  *
  *****************************************************************************/
 
+#include <linux/proc_fs.h>
+
 #include "wifi.h"
 #include "cam.h"
 
diff --git a/drivers/staging/rtl8821ae/debug.c b/drivers/staging/rtl8821ae/debug.c
index 8aefbf1..727276e 100644
--- a/drivers/staging/rtl8821ae/debug.c
+++ b/drivers/staging/rtl8821ae/debug.c
@@ -27,6 +27,8 @@
  *
  *****************************************************************************/
 
+#include <linux/proc_fs.h>
+
 #include "wifi.h"
 #include "cam.h"
 
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 1d09289..ca55cfd 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -12,6 +12,7 @@
 
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/proc_fs.h>
 #include <linux/sched.h>
 #include <linux/time.h>
 #include <linux/kernel.h>
diff --git a/fs/nfsd/export.h b/fs/nfsd/export.h
index cfeea85..a4ff95f 100644
--- a/fs/nfsd/export.h
+++ b/fs/nfsd/export.h
@@ -4,6 +4,7 @@
 #ifndef NFSD_EXPORT_H
 #define NFSD_EXPORT_H
 
+#include <linux/path.h>
 #include <linux/sunrpc/cache.h>
 #include <uapi/linux/nfsd/export.h>
 
diff --git a/fs/nfsd/netns.h b/fs/nfsd/netns.h
index d32b3aa..5bd5dcd 100644
--- a/fs/nfsd/netns.h
+++ b/fs/nfsd/netns.h
@@ -21,6 +21,7 @@
 #ifndef __NFSD_NETNS_H__
 #define __NFSD_NETNS_H__
 
+#include <linux/fs.h>
 #include <net/net_namespace.h>
 #include <net/netns/generic.h>
 
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index 5184404..d173ce9 100644
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -4,6 +4,7 @@
  * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
  */
 
+#include <linux/proc_fs.h>
 #include <linux/slab.h>
 #include <linux/namei.h>
 #include <linux/ctype.h>
diff --git a/fs/nfsd/nfsfh.h b/fs/nfsd/nfsfh.h
index 2e89e70..02e9d73 100644
--- a/fs/nfsd/nfsfh.h
+++ b/fs/nfsd/nfsfh.h
@@ -7,6 +7,7 @@
 #ifndef _LINUX_NFSD_NFSFH_H
 #define _LINUX_NFSD_NFSFH_H
 
+#include <linux/fs.h>
 #include <linux/sunrpc/svc.h>
 #include <uapi/linux/nfsd/nfsfh.h>
 
diff --git a/fs/nfsd/stats.c b/fs/nfsd/stats.c
index cd90878..592d972 100644
--- a/fs/nfsd/stats.c
+++ b/fs/nfsd/stats.c
@@ -21,6 +21,7 @@
  * Copyright (C) 1995, 1996, 1997 Olaf Kirch <okir@monad.swb.de>
  */
 
+#include <linux/fs.h>
 #include <linux/seq_file.h>
 #include <linux/module.h>
 #include <linux/sunrpc/stats.h>
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index b571458..2644217 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -92,7 +92,7 @@ acpi_evaluate_dsm_typed(acpi_handle handle, const u8 *uuid, int rev, int func,
 
 #ifdef CONFIG_ACPI
 
-#include <linux/proc_fs.h>
+struct proc_dir_entry;
 
 #define ACPI_BUS_FILE_ROOT	"acpi"
 extern struct proc_dir_entry *acpi_root_dir;
diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
index c1da539..96665e3 100644
--- a/include/linux/atmdev.h
+++ b/include/linux/atmdev.h
@@ -14,7 +14,7 @@
 #include <uapi/linux/atmdev.h>
 
 #ifdef CONFIG_PROC_FS
-#include <linux/proc_fs.h>
+struct proc_dir_entry;
 
 extern struct proc_dir_entry *atm_proc_root;
 #endif
diff --git a/include/linux/crash_dump.h b/include/linux/crash_dump.h
index 72ab536..f07e2a3 100644
--- a/include/linux/crash_dump.h
+++ b/include/linux/crash_dump.h
@@ -3,7 +3,6 @@
 
 #ifdef CONFIG_CRASH_DUMP
 #include <linux/kexec.h>
-#include <linux/proc_fs.h>
 #include <linux/elf.h>
 
 #include <asm/pgtable.h> /* for pgprot_t */
diff --git a/include/linux/efi.h b/include/linux/efi.h
index 41bbf8b..76a6954 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -15,7 +15,6 @@
 #include <linux/string.h>
 #include <linux/time.h>
 #include <linux/types.h>
-#include <linux/proc_fs.h>
 #include <linux/rtc.h>
 #include <linux/ioport.h>
 #include <linux/pfn.h>
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 93b5ca7..8316575 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -10,7 +10,6 @@
 #include <linux/ioport.h>
 #include <linux/ata.h>
 #include <linux/blkdev.h>
-#include <linux/proc_fs.h>
 #include <linux/interrupt.h>
 #include <linux/bitops.h>
 #include <linux/bio.h>
@@ -38,6 +37,7 @@
 #define ERROR_RECAL	1	/* Recalibrate every 2nd retry */
 
 struct device;
+struct proc_dir_entry;
 
 /* Error codes returned in rq->errors to the higher part of the driver. */
 enum {
diff --git a/include/linux/ipmi.h b/include/linux/ipmi.h
index 76d2acb..30b91f1 100644
--- a/include/linux/ipmi.h
+++ b/include/linux/ipmi.h
@@ -36,7 +36,6 @@
 #include <uapi/linux/ipmi.h>
 
 #include <linux/list.h>
-#include <linux/proc_fs.h>
 
 struct module;
 struct device;
diff --git a/include/linux/ipmi_smi.h b/include/linux/ipmi_smi.h
index bd34924..7a5e587 100644
--- a/include/linux/ipmi_smi.h
+++ b/include/linux/ipmi_smi.h
@@ -35,7 +35,6 @@
 #define __LINUX_IPMI_SMI_H
 
 #include <linux/ipmi_msgdefs.h>
-#include <linux/proc_fs.h>
 #include <linux/platform_device.h>
 #include <linux/ipmi.h>
 
diff --git a/include/linux/parport.h b/include/linux/parport.h
index c22f125..72498ad 100644
--- a/include/linux/parport.h
+++ b/include/linux/parport.h
@@ -8,7 +8,6 @@
 
 
 #include <linux/jiffies.h>
-#include <linux/proc_fs.h>
 #include <linux/spinlock.h>
 #include <linux/wait.h>
 #include <linux/irqreturn.h>
diff --git a/include/linux/posix_acl.h b/include/linux/posix_acl.h
index 3e96a6a..119d51a 100644
--- a/include/linux/posix_acl.h
+++ b/include/linux/posix_acl.h
@@ -9,6 +9,7 @@
 #define __LINUX_POSIX_ACL_H
 
 #include <linux/bug.h>
+#include <linux/fs.h>
 #include <linux/slab.h>
 #include <linux/rcupdate.h>
 
diff --git a/include/linux/sunrpc/cache.h b/include/linux/sunrpc/cache.h
index 437ddb6..0eb89f5 100644
--- a/include/linux/sunrpc/cache.h
+++ b/include/linux/sunrpc/cache.h
@@ -16,7 +16,8 @@
 #include <linux/kref.h>
 #include <linux/slab.h>
 #include <linux/atomic.h>
-#include <linux/proc_fs.h>
+
+struct proc_dir_entry;
 
 /*
  * Each cache requires:
diff --git a/include/linux/sunrpc/rpc_pipe_fs.h b/include/linux/sunrpc/rpc_pipe_fs.h
index 7f490be..0e21303 100644
--- a/include/linux/sunrpc/rpc_pipe_fs.h
+++ b/include/linux/sunrpc/rpc_pipe_fs.h
@@ -3,6 +3,7 @@
 
 #ifdef __KERNEL__
 
+#include <linux/fs.h>
 #include <linux/workqueue.h>
 
 struct rpc_pipe_dir_head {
diff --git a/include/linux/sunrpc/stats.h b/include/linux/sunrpc/stats.h
index edc6421..349946d 100644
--- a/include/linux/sunrpc/stats.h
+++ b/include/linux/sunrpc/stats.h
@@ -9,7 +9,7 @@
 #ifndef _LINUX_SUNRPC_STATS_H
 #define _LINUX_SUNRPC_STATS_H
 
-#include <linux/proc_fs.h>
+struct proc_dir_entry;
 
 struct rpc_stat {
 	const struct rpc_program *program;
diff --git a/include/net/netns/netfilter.h b/include/net/netns/netfilter.h
index 8874002..a50f814f 100644
--- a/include/net/netns/netfilter.h
+++ b/include/net/netns/netfilter.h
@@ -1,10 +1,10 @@
 #ifndef __NETNS_NETFILTER_H
 #define __NETNS_NETFILTER_H
 
-#include <linux/proc_fs.h>
 #include <linux/netfilter.h>
 
 struct nf_logger;
+struct proc_dir_entry;
 
 struct netns_nf {
 #if defined CONFIG_PROC_FS
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index 8e4de46..cf0109b 100644
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -59,7 +59,6 @@
 #include <linux/slab.h>
 #include <linux/in.h>
 #include <linux/tty.h>
-#include <linux/proc_fs.h>
 #include <linux/spinlock.h>
 #include <linux/jiffies.h>
 #include <linux/idr.h>
diff --git a/net/atm/br2684.c b/net/atm/br2684.c
index 403e71f..4c161fd 100644
--- a/net/atm/br2684.c
+++ b/net/atm/br2684.c
@@ -18,6 +18,7 @@
 #include <linux/rtnetlink.h>
 #include <linux/ip.h>
 #include <linux/uaccess.h>
+#include <linux/proc_fs.h>
 #include <linux/slab.h>
 #include <net/arp.h>
 #include <linux/atm.h>
diff --git a/net/netfilter/nf_synproxy_core.c b/net/netfilter/nf_synproxy_core.c
index 52e20c9..321dd9e 100644
--- a/net/netfilter/nf_synproxy_core.c
+++ b/net/netfilter/nf_synproxy_core.c
@@ -7,6 +7,7 @@
  */
 
 #include <linux/module.h>
+#include <linux/proc_fs.h>
 #include <linux/skbuff.h>
 #include <asm/unaligned.h>
 #include <net/tcp.h>
diff --git a/net/sctp/objcnt.c b/net/sctp/objcnt.c
index 40e7fac..cf6317e 100644
--- a/net/sctp/objcnt.c
+++ b/net/sctp/objcnt.c
@@ -34,6 +34,7 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/kernel.h>
+#include <linux/proc_fs.h>
 #include <net/sctp/sctp.h>
 
 /*
diff --git a/net/sctp/proc.c b/net/sctp/proc.c
index 34229ee..09d65f9 100644
--- a/net/sctp/proc.c
+++ b/net/sctp/proc.c
@@ -28,6 +28,7 @@
  */
 
 #include <linux/types.h>
+#include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/init.h>
 #include <linux/export.h>
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
index 6789d785..030b855 100644
--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
@@ -45,6 +45,7 @@
 #include <linux/init.h>
 #include <linux/netdevice.h>
 #include <linux/inetdevice.h>
+#include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/bootmem.h>
 #include <linux/highmem.h>
diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
index 4ce5ecce..fbb4c32 100644
--- a/net/sunrpc/auth_gss/svcauth_gss.c
+++ b/net/sunrpc/auth_gss/svcauth_gss.c
@@ -41,6 +41,7 @@
 #include <linux/types.h>
 #include <linux/module.h>
 #include <linux/pagemap.h>
+#include <linux/proc_fs.h>
 #include <linux/user_namespace.h>
 
 #include <linux/sunrpc/auth_gss.h>
-- 
1.8.5.5