[PATCH 02/12] headers: fs.h vs poll.h

From: Alexey Dobriyan
Date: Fri Jun 20 2014 - 17:38:23 EST


---
drivers/char/ipmi/ipmi_watchdog.c | 1 +
drivers/char/ppdev.c | 1 +
drivers/gpu/vga/vgaarb.c | 1 +
drivers/input/serio/serio_raw.c | 1 +
drivers/misc/mic/host/mic_fops.c | 1 +
drivers/platform/goldfish/goldfish_pipe.c | 1 +
drivers/pps/pps.c | 1 +
drivers/rtc/interface.c | 1 +
drivers/rtc/rtc-dev.c | 1 +
drivers/staging/comedi/drivers/serial2002.c | 1 +
drivers/vfio/pci/vfio_pci_intrs.c | 1 +
include/linux/poll.h | 2 +-
include/sound/pcm.h | 1 +
sound/core/control.c | 1 +
sound/core/hwdep.c | 1 +
sound/core/init.c | 1 +
sound/core/oss/mixer_oss.c | 1 +
sound/core/rawmidi.c | 1 +
sound/core/seq/oss/seq_oss.c | 1 +
sound/core/seq/oss/seq_oss_init.c | 1 +
sound/core/sound.c | 1 +
sound/core/timer.c | 1 +
22 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c
index 37b8be7..e96f3c4 100644
--- a/drivers/char/ipmi/ipmi_watchdog.c
+++ b/drivers/char/ipmi/ipmi_watchdog.c
@@ -31,6 +31,7 @@
* 675 Mass Ave, Cambridge, MA 02139, USA.
*/

+#include <linux/fs.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/ipmi.h>
diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c
index ae0b42b..3964887 100644
--- a/drivers/char/ppdev.c
+++ b/drivers/char/ppdev.c
@@ -56,6 +56,7 @@
* Added GETFLAGS/SETFLAGS ioctls, Fred Barnes, 04/2001
*/

+#include <linux/fs.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/sched.h>
diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c
index af02597..158741b 100644
--- a/drivers/gpu/vga/vgaarb.c
+++ b/drivers/gpu/vga/vgaarb.c
@@ -29,6 +29,7 @@
*
*/

+#include <linux/fs.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/pci.h>
diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
index c9a02fe..bf9a51b 100644
--- a/drivers/input/serio/serio_raw.c
+++ b/drivers/input/serio/serio_raw.c
@@ -9,6 +9,7 @@
* the Free Software Foundation.
*/

+#include <linux/fs.h>
#include <linux/kref.h>
#include <linux/sched.h>
#include <linux/slab.h>
diff --git a/drivers/misc/mic/host/mic_fops.c b/drivers/misc/mic/host/mic_fops.c
index 85776d7..a6e621c 100644
--- a/drivers/misc/mic/host/mic_fops.c
+++ b/drivers/misc/mic/host/mic_fops.c
@@ -18,6 +18,7 @@
* Intel MIC Host driver.
*
*/
+#include <linux/fs.h>
#include <linux/poll.h>
#include <linux/pci.h>

diff --git a/drivers/platform/goldfish/goldfish_pipe.c b/drivers/platform/goldfish/goldfish_pipe.c
index d9a09d9..305db89 100644
--- a/drivers/platform/goldfish/goldfish_pipe.c
+++ b/drivers/platform/goldfish/goldfish_pipe.c
@@ -45,6 +45,7 @@
* exchange is properly mapped during a transfer.
*/

+#include <linux/fs.h>
#include <linux/module.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
diff --git a/drivers/pps/pps.c b/drivers/pps/pps.c
index 2f07cd6..f39a069 100644
--- a/drivers/pps/pps.c
+++ b/drivers/pps/pps.c
@@ -21,6 +21,7 @@

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/fs.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/init.h>
diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c
index 5813fa5..17e19a5 100644
--- a/drivers/rtc/interface.c
+++ b/drivers/rtc/interface.c
@@ -11,6 +11,7 @@
* published by the Free Software Foundation.
*/

+#include <linux/fs.h>
#include <linux/rtc.h>
#include <linux/sched.h>
#include <linux/module.h>
diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
index d049393..28d49f5 100644
--- a/drivers/rtc/rtc-dev.c
+++ b/drivers/rtc/rtc-dev.c
@@ -13,6 +13,7 @@

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/fs.h>
#include <linux/module.h>
#include <linux/rtc.h>
#include <linux/sched.h>
diff --git a/drivers/staging/comedi/drivers/serial2002.c b/drivers/staging/comedi/drivers/serial2002.c
index 441813f..6d32a5c 100644
--- a/drivers/staging/comedi/drivers/serial2002.c
+++ b/drivers/staging/comedi/drivers/serial2002.c
@@ -26,6 +26,7 @@ Status: in development

*/

+#include <linux/fs.h>
#include <linux/module.h>
#include "../comedidev.h"

diff --git a/drivers/vfio/pci/vfio_pci_intrs.c b/drivers/vfio/pci/vfio_pci_intrs.c
index 9dd49c9..00f8eb9 100644
--- a/drivers/vfio/pci/vfio_pci_intrs.c
+++ b/drivers/vfio/pci/vfio_pci_intrs.c
@@ -14,6 +14,7 @@
*/

#include <linux/device.h>
+#include <linux/fs.h>
#include <linux/interrupt.h>
#include <linux/eventfd.h>
#include <linux/pci.h>
diff --git a/include/linux/poll.h b/include/linux/poll.h
index c08386f..a1f2c6e 100644
--- a/include/linux/poll.h
+++ b/include/linux/poll.h
@@ -6,7 +6,6 @@
#include <linux/ktime.h>
#include <linux/wait.h>
#include <linux/string.h>
-#include <linux/fs.h>
#include <linux/sysctl.h>
#include <asm/uaccess.h>
#include <uapi/linux/poll.h>
@@ -23,6 +22,7 @@ extern struct ctl_table epoll_table[]; /* for sysctl */

#define DEFAULT_POLLMASK (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM)

+struct file;
struct poll_table_struct;

/*
diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index d854fb3..c150d9f 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -26,6 +26,7 @@
#include <sound/asound.h>
#include <sound/memalloc.h>
#include <sound/minors.h>
+#include <linux/fs.h>
#include <linux/poll.h>
#include <linux/mm.h>
#include <linux/bitops.h>
diff --git a/sound/core/control.c b/sound/core/control.c
index f0b0e14..01071ef 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -19,6 +19,7 @@
*
*/

+#include <linux/fs.h>
#include <linux/threads.h>
#include <linux/interrupt.h>
#include <linux/module.h>
diff --git a/sound/core/hwdep.c b/sound/core/hwdep.c
index 69459e5..543174b 100644
--- a/sound/core/hwdep.c
+++ b/sound/core/hwdep.c
@@ -19,6 +19,7 @@
*
*/

+#include <linux/fs.h>
#include <linux/major.h>
#include <linux/init.h>
#include <linux/slab.h>
diff --git a/sound/core/init.c b/sound/core/init.c
index 7bdfd19..78321e7 100644
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -19,6 +19,7 @@
*
*/

+#include <linux/fs.h>
#include <linux/init.h>
#include <linux/sched.h>
#include <linux/module.h>
diff --git a/sound/core/oss/mixer_oss.c b/sound/core/oss/mixer_oss.c
index 5e6349f..60ac476 100644
--- a/sound/core/oss/mixer_oss.c
+++ b/sound/core/oss/mixer_oss.c
@@ -19,6 +19,7 @@
*
*/

+#include <linux/fs.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/time.h>
diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c
index 6fc71a4..656f6c6 100644
--- a/sound/core/rawmidi.c
+++ b/sound/core/rawmidi.c
@@ -20,6 +20,7 @@
*/

#include <sound/core.h>
+#include <linux/fs.h>
#include <linux/major.h>
#include <linux/init.h>
#include <linux/sched.h>
diff --git a/sound/core/seq/oss/seq_oss.c b/sound/core/seq/oss/seq_oss.c
index 16d4267..128cab6 100644
--- a/sound/core/seq/oss/seq_oss.c
+++ b/sound/core/seq/oss/seq_oss.c
@@ -20,6 +20,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/

+#include <linux/fs.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/mutex.h>
diff --git a/sound/core/seq/oss/seq_oss_init.c b/sound/core/seq/oss/seq_oss_init.c
index b9184d2..25bb61a 100644
--- a/sound/core/seq/oss/seq_oss_init.c
+++ b/sound/core/seq/oss/seq_oss_init.c
@@ -27,6 +27,7 @@
#include "seq_oss_readq.h"
#include "seq_oss_timer.h"
#include "seq_oss_event.h"
+#include <linux/fs.h>
#include <linux/init.h>
#include <linux/export.h>
#include <linux/moduleparam.h>
diff --git a/sound/core/sound.c b/sound/core/sound.c
index 38ad1a0..0e324b3 100644
--- a/sound/core/sound.c
+++ b/sound/core/sound.c
@@ -19,6 +19,7 @@
*
*/

+#include <linux/fs.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/time.h>
diff --git a/sound/core/timer.c b/sound/core/timer.c
index 777a45e..0a76d39 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -20,6 +20,7 @@
*/

#include <linux/delay.h>
+#include <linux/fs.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/time.h>
--
1.8.5.5


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