]> err.no Git - linux-2.6/commit
[PATCH] sanitize building of fs/compat_ioctl.c
authorChristoph Hellwig <hch@lst.de>
Tue, 10 Jan 2006 04:52:14 +0000 (20:52 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 10 Jan 2006 16:01:33 +0000 (08:01 -0800)
commite6a6d2efcb7e7c87c5fe0395803da1453b29cbef
tree76061b3067e22ba78cce975e5f729c6a6a37fce5
parent8262037f406dc8e0908ad51f355c3dfd4d662aba
[PATCH] sanitize building of fs/compat_ioctl.c

Now that all these entries in the arch ioctl32.c files are gone [1], we can
build fs/compat_ioctl.c as a normal object and kill tons of cruft.  We need a
special do_ioctl32_pointer handler for s390 so the compat_ptr call is done.
This is not needed but harmless on all other architectures.  Also remove some
superflous includes in fs/compat_ioctl.c

Tested on ppc64.

[1] parisc still had it's PPP handler left, which is not fully correct
    for ppp and besides that ppp uses the generic SIOCPRIV ioctl so it'd
    kick in for all netdevice users.  We can introduce a proper handler
    in one of the next patch series by adding a compat_ioctl method to
    struct net_device but for now let's just kill it - parisc doesn't
    compile in mainline anyway and I don't want this to block this
    patchset.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Cc: Matthew Wilcox <willy@debian.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 files changed:
arch/ia64/ia32/Makefile
arch/ia64/ia32/ia32_ioctl.c [deleted file]
arch/mips/kernel/Makefile
arch/mips/kernel/ioctl32.c [deleted file]
arch/parisc/kernel/Makefile
arch/parisc/kernel/ioctl32.c [deleted file]
arch/powerpc/kernel/Makefile
arch/powerpc/kernel/ioctl32.c [deleted file]
arch/s390/kernel/Makefile
arch/s390/kernel/compat_ioctl.c [deleted file]
arch/sparc64/kernel/Makefile
arch/sparc64/kernel/ioctl32.c [deleted file]
arch/x86_64/ia32/Makefile
arch/x86_64/ia32/ia32_ioctl.c [deleted file]
fs/Makefile
fs/compat_ioctl.c
include/linux/compat_ioctl.h