[PATCH 05/12] headers: fs.h vs compat.h

From: Alexey Dobriyan
Date: Fri Jun 20 2014 - 18:29:47 EST


---
drivers/char/ipmi/ipmi_devintf.c | 1 +
drivers/char/lp.c | 1 +
include/linux/compat.h | 3 ++-
sound/core/seq/seq_clientmgr.c | 1 +
4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/char/ipmi/ipmi_devintf.c b/drivers/char/ipmi/ipmi_devintf.c
index ec318bf..db366fe 100644
--- a/drivers/char/ipmi/ipmi_devintf.c
+++ b/drivers/char/ipmi/ipmi_devintf.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/errno.h>
diff --git a/drivers/char/lp.c b/drivers/char/lp.c
index c4094c4..6bb8538 100644
--- a/drivers/char/lp.c
+++ b/drivers/char/lp.c
@@ -111,6 +111,7 @@
* Copyright (C) 2000 by Tim Waugh (added LPSETTIMEOUT ioctl)
*/

+#include <linux/fs.h>
#include <linux/module.h>
#include <linux/init.h>

diff --git a/include/linux/compat.h b/include/linux/compat.h
index e649426..7849cec 100644
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -12,7 +12,6 @@
#include <linux/sem.h>
#include <linux/socket.h>
#include <linux/if.h>
-#include <linux/fs.h>
#include <linux/aio_abi.h> /* for aio_context_t */
#include <linux/unistd.h>

@@ -69,6 +68,8 @@ typedef struct compat_sigaltstack {
#define compat_jiffies_to_clock_t(x) \
(((unsigned long)(x) * COMPAT_USER_HZ) / HZ)

+struct file_handle;
+
typedef __compat_uid32_t compat_uid_t;
typedef __compat_gid32_t compat_gid_t;

diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c
index 225c7315..8423da0 100644
--- a/sound/core/seq/seq_clientmgr.c
+++ b/sound/core/seq/seq_clientmgr.c
@@ -21,6 +21,7 @@
*
*/

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


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