Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=d9de2622bd4fd29cab4ef7db66a9f916cb38e032
Commit: d9de2622bd4fd29cab4ef7db66a9f916cb38e032
Parent: 643bd27298bdcc4e75b3e6a7ca459675eb5378c3
Author: Simon Horman <[EMAIL PROTECTED]>
AuthorDate: Thu May 10 11:51:11 2007 -0700
Committer: Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Thu May 10 13:34:05 2007 -0700
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 <[EMAIL PROTECTED]>
Acked-by: Arnd Bergmann <[EMAIL PROTECTED]>
Cc: Andi Kleen <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
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 d92bc3e..65643de 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)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
