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]>
From: Simon Horman <[EMAIL PROTECTED]>

Index: linux-2.6/fs/compat_ioctl.c
===================================================================
--- linux-2.6.orig/fs/compat_ioctl.c    2007-05-10 18:40:19.000000000 +0900
+++ linux-2.6/fs/compat_ioctl.c 2007-05-10 18:40:23.000000000 +0900
@@ -3566,10 +3566,13 @@ asmlinkage long compat_sys_ioctl(unsigne
                        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 linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to