diff options
| author | Simon Horman | 2007-05-10 20:51:11 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2007-05-10 22:34:05 +0200 |
| commit | d9de2622bd4fd29cab4ef7db66a9f916cb38e032 (patch) | |
| tree | 60bb4a5f186c776695e2c3bee6bc7dec996dfe45 /fs/compat_ioctl.c | |
| parent | Fix ixp4xx compile error (diff) | |
| download | kernel-qcow2-linux-d9de2622bd4fd29cab4ef7db66a9f916cb38e032.tar.gz kernel-qcow2-linux-d9de2622bd4fd29cab4ef7db66a9f916cb38e032.tar.xz kernel-qcow2-linux-d9de2622bd4fd29cab4ef7db66a9f916cb38e032.zip | |
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>
Diffstat (limited to 'fs/compat_ioctl.c')
| -rw-r--r-- | fs/compat_ioctl.c | 5 |
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, goto found_handler; } +#ifdef CONFIG_NET if (S_ISSOCK(filp->f_path.dentry->d_inode->i_mode) && cmd >= SIOCDEVPRIVATE && cmd <= (SIOCDEVPRIVATE + 15)) { error = siocdevprivate_ioctl(fd, cmd, arg); - } else { + } else +#endif + { static int count; if (++count <= 50) |