From: Randy Dunlap <randy.dunlap@oracle.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
Arnd Bergmann <arnd@arndb.de>, Al Viro <viro@zeniv.linux.org.uk>
Subject: [PATCH -next] fs: fix compat_ioctl when CONFIG_BLOCK=n
Date: Thu, 25 Feb 2010 09:55:09 -0800 [thread overview]
Message-ID: <4B86B97D.6030208@oracle.com> (raw)
In-Reply-To: <20100225183523.80361261.sfr@canb.auug.org.au>
From: Randy Dunlap <randy.dunlap@oracle.com>
fs/compat_ioctl.c should omit pktcdvd.h and its ioctl when CONFIG_BLOCK
is not enabled. This fixes these build errors:
In file included from fs/compat_ioctl.c:105:
include/linux/pktcdvd.h:166: error: field 'read_queue' has incomplete type
include/linux/pktcdvd.h:167: error: field 'write_queue' has incomplete type
include/linux/pktcdvd.h:207: error: field 'orig_bios' has incomplete type
make[2]: *** [fs/compat_ioctl.o] Error 1
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Al Viro <viro@zeniv.linux.org.uk>
---
fs/compat_ioctl.c | 4 ++++
1 file changed, 4 insertions(+)
--- linux-next-20100225.orig/fs/compat_ioctl.c
+++ linux-next-20100225/fs/compat_ioctl.c
@@ -102,7 +102,9 @@
#include <linux/nbd.h>
#include <linux/random.h>
#include <linux/filter.h>
+#ifdef CONFIG_BLOCK
#include <linux/pktcdvd.h>
+#endif
#include <linux/hiddev.h>
@@ -1126,8 +1128,10 @@ COMPATIBLE_IOCTL(PPGETMODE)
COMPATIBLE_IOCTL(PPGETPHASE)
COMPATIBLE_IOCTL(PPGETFLAGS)
COMPATIBLE_IOCTL(PPSETFLAGS)
+#ifdef CONFIG_BLOCK
/* pktcdvd */
COMPATIBLE_IOCTL(PACKET_CTRL_CMD)
+#endif
/* Big A */
/* sparc only */
/* Big Q for sound/OSS */
next prev parent reply other threads:[~2010-02-25 17:55 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-25 7:35 linux-next: Tree for February 25 Stephen Rothwell
2010-02-25 17:21 ` linux-next: Tree for February 25 (quota) Randy Dunlap
2010-03-01 13:27 ` Jan Kara
2010-03-01 16:56 ` Randy Dunlap
2010-02-25 17:55 ` [PATCH -next] staging: fix wlan-ng printk format warning Randy Dunlap
2010-02-25 17:55 ` Randy Dunlap [this message]
2010-02-25 21:27 ` [PATCH -next] pktcdvd: improve BKL and compat_ioctl.c usage Arnd Bergmann
2010-02-25 22:10 ` Randy Dunlap
2010-03-02 12:06 ` Ingo Molnar
2010-03-02 23:38 ` Stephen Rothwell
2010-02-25 22:41 ` [PATCH -next] staging/pohmelfs: fix write_inode parameter warning Randy Dunlap
2010-02-26 0:41 ` Stephen Rothwell
2010-03-07 9:22 ` Geert Uytterhoeven
2010-03-07 15:50 ` Greg KH
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=4B86B97D.6030208@oracle.com \
--to=randy.dunlap@oracle.com \
--cc=arnd@arndb.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=viro@zeniv.linux.org.uk \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).