* [PATCH] Allow compat_ioctl.c to compile without CONFIG_NET
@ 2007-05-10 9:41 Simon Horman
2007-05-10 11:06 ` Arnd Bergmann
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Simon Horman @ 2007-05-10 9:41 UTC (permalink / raw)
To: linux-kernel; +Cc: Christoph Hellwig, Andi Kleen, Bergmann, Andrew Morton
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>
From: Simon Horman <horms@verge.net.au>
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)
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] Allow compat_ioctl.c to compile without CONFIG_NET
2007-05-10 9:41 [PATCH] Allow compat_ioctl.c to compile without CONFIG_NET Simon Horman
@ 2007-05-10 11:06 ` Arnd Bergmann
2007-05-10 13:05 ` Andi Kleen
2007-05-10 15:52 ` Christoph Hellwig
2 siblings, 0 replies; 4+ messages in thread
From: Arnd Bergmann @ 2007-05-10 11:06 UTC (permalink / raw)
To: Simon Horman; +Cc: linux-kernel, Christoph Hellwig, Andi Kleen, Andrew Morton
On Thursday 10 May 2007, Simon Horman wrote:
> 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>
> From: Simon Horman <horms@verge.net.au>
Acked-by: Arnd Bergmann <arnd@arndb.de>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Allow compat_ioctl.c to compile without CONFIG_NET
2007-05-10 9:41 [PATCH] Allow compat_ioctl.c to compile without CONFIG_NET Simon Horman
2007-05-10 11:06 ` Arnd Bergmann
@ 2007-05-10 13:05 ` Andi Kleen
2007-05-10 15:52 ` Christoph Hellwig
2 siblings, 0 replies; 4+ messages in thread
From: Andi Kleen @ 2007-05-10 13:05 UTC (permalink / raw)
To: Simon Horman
Cc: linux-kernel, Christoph Hellwig, Andi Kleen, Bergmann,
Andrew Morton
On Thu, May 10, 2007 at 06:41:20PM +0900, Simon Horman wrote:
> 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'
>
Thanks makes sense. I assume Andrew will just pass it on.
-Andi
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Allow compat_ioctl.c to compile without CONFIG_NET
2007-05-10 9:41 [PATCH] Allow compat_ioctl.c to compile without CONFIG_NET Simon Horman
2007-05-10 11:06 ` Arnd Bergmann
2007-05-10 13:05 ` Andi Kleen
@ 2007-05-10 15:52 ` Christoph Hellwig
2 siblings, 0 replies; 4+ messages in thread
From: Christoph Hellwig @ 2007-05-10 15:52 UTC (permalink / raw)
To: Simon Horman
Cc: linux-kernel, Christoph Hellwig, Andi Kleen, Bergmann,
Andrew Morton
On Thu, May 10, 2007 at 06:41:20PM +0900, Simon Horman wrote:
> 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>
> From: Simon Horman <horms@verge.net.au>
Ok.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2007-05-10 15:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-05-10 9:41 [PATCH] Allow compat_ioctl.c to compile without CONFIG_NET Simon Horman
2007-05-10 11:06 ` Arnd Bergmann
2007-05-10 13:05 ` Andi Kleen
2007-05-10 15:52 ` Christoph Hellwig
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox