From: Johannes Stezenbach <js@sig21.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jens Axboe <axboe@kernel.dk>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Arnd Bergmann <arnd@arndb.de>
Subject: [PATCH] compat_ioctl: fix make headers_check regression
Date: Mon, 4 Jul 2011 12:03:17 +0200 [thread overview]
Message-ID: <20110704100316.GA15894@sig21.net> (raw)
In-Reply-To: <20110704134842.7ab89126.sfr@canb.auug.org.au>
Fix headers_check error introduced by 390192b30057:
include/linux/fd.h:6: included file 'linux/compat.h' is not exported
Signed-off-by: Johannes Stezenbach <js@sig21.net>
---
I used the same style as in linux/usbdevice_fs.h, hope
that's OK.
include/linux/fd.h | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/include/linux/fd.h b/include/linux/fd.h
index c6a68d0..72202b1 100644
--- a/include/linux/fd.h
+++ b/include/linux/fd.h
@@ -3,7 +3,6 @@
#include <linux/ioctl.h>
#include <linux/compiler.h>
-#include <linux/compat.h>
/* New file layout: Now the ioctl definitions immediately follow the
* definitions of the structures that they use */
@@ -378,7 +377,11 @@ struct floppy_raw_cmd {
#define FDEJECT _IO(2, 0x5a)
/* eject the disk */
+
+#ifdef __KERNEL__
#ifdef CONFIG_COMPAT
+#include <linux/compat.h>
+
struct compat_floppy_struct {
compat_uint_t size;
compat_uint_t sect;
@@ -394,5 +397,6 @@ struct compat_floppy_struct {
#define FDGETPRM32 _IOR(2, 0x04, struct compat_floppy_struct)
#endif
+#endif
#endif
next prev parent reply other threads:[~2011-07-04 10:03 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-04 3:48 linux-next: build failure after merge of the block tree Stephen Rothwell
2011-07-04 10:03 ` Johannes Stezenbach [this message]
2011-07-06 22:51 ` [PATCH] compat_ioctl: fix make headers_check regression Johannes Stezenbach
2011-07-06 23:11 ` Andrew Morton
2011-07-07 8:32 ` Johannes Stezenbach
2011-07-07 6:19 ` Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110704100316.GA15894@sig21.net \
--to=js@sig21.net \
--cc=arnd@arndb.de \
--cc=axboe@kernel.dk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.