aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Horman <horms@verge.net.au>2007-05-10 14:51:11 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-10 16:34:05 -0400
commitd9de2622bd4fd29cab4ef7db66a9f916cb38e032 (patch)
tree60bb4a5f186c776695e2c3bee6bc7dec996dfe45
parent643bd27298bdcc4e75b3e6a7ca459675eb5378c3 (diff)
Allow compat_ioctl.c to compile without CONFIG_NET
A small regression appears to have been introduced in the recent patch "cleanup compat ioctl handling", which was included in Linus' tree after 2.6.20. siocdevprivate_ioctl() is no longer defined if CONFIG_NET is undefined, whereas previously it was a dummy function in this case. This causes compilation with CONFIG_COMPAT but without CONFIG_NET to fail. fs/compat_ioctl.c: In function `compat_sys_ioctl': fs/compat_ioctl.c:3571: warning: implicit declaration of function `siocdevprivate_ioctl' Cc: Christoph Hellwig <hch@lst.de> Acked-by: Arnd Bergmann <arnd@arndb.de> Cc: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--fs/compat_ioctl.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
index d92bc3eb7afc..65643def3182 100644
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@ -3566,10 +3566,13 @@ asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd,
3566 goto found_handler; 3566 goto found_handler;
3567 } 3567 }
3568 3568
3569#ifdef CONFIG_NET
3569 if (S_ISSOCK(filp->f_path.dentry->d_inode->i_mode) && 3570 if (S_ISSOCK(filp->f_path.dentry->d_inode->i_mode) &&
3570 cmd >= SIOCDEVPRIVATE && cmd <= (SIOCDEVPRIVATE + 15)) { 3571 cmd >= SIOCDEVPRIVATE && cmd <= (SIOCDEVPRIVATE + 15)) {
3571 error = siocdevprivate_ioctl(fd, cmd, arg); 3572 error = siocdevprivate_ioctl(fd, cmd, arg);
3572 } else { 3573 } else
3574#endif
3575 {
3573 static int count; 3576 static int count;
3574 3577
3575 if (++count <= 50) 3578 if (++count <= 50)