Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6a6d2ef authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

[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: default avatarChristoph Hellwig <hch@lst.de>
Cc: Matthew Wilcox <willy@debian.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8262037f

arch/ia64/ia32/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -2,11 +2,9 @@ 
# Makefile for the ia32 kernel emulation subsystem.

#



obj-y := ia32_entry.o sys_ia32.o ia32_ioctl.o ia32_signal.o \

obj-y := ia32_entry.o sys_ia32.o ia32_signal.o \

	 ia32_support.o ia32_traps.o binfmt_elf32.o ia32_ldt.o



CFLAGS_ia32_ioctl.o += -Ifs/



# Don't let GCC uses f16-f31 so that save_ia32_fpstate_live() and

# restore_ia32_fpstate_live() can be sure the live register contain user-level state.

CFLAGS_ia32_signal.o += -mfixed-range=f16-f31

arch/ia64/ia32/ia32_ioctl.c

deleted100644 → 0
+0 −45
Original line number Diff line number Diff line 
/*

 * IA32 Architecture-specific ioctl shim code

 *

 * Copyright (C) 2000 VA Linux Co

 * Copyright (C) 2000 Don Dugger <n0ano@valinux.com>

 * Copyright (C) 2001-2003 Hewlett-Packard Co

 *	David Mosberger-Tang <davidm@hpl.hp.com>

 */



#include <linux/signal.h>	/* argh, msdos_fs.h isn't self-contained... */

#include <linux/syscalls.h>

#include "ia32priv.h"

  

#define	INCLUDES

#include "compat_ioctl.c"



#define IOCTL_NR(a)	((a) & ~(_IOC_SIZEMASK << _IOC_SIZESHIFT))



#define DO_IOCTL(fd, cmd, arg) ({			\

	int _ret;					\

	mm_segment_t _old_fs = get_fs();		\

							\

	set_fs(KERNEL_DS);				\

	_ret = sys_ioctl(fd, cmd, (unsigned long)arg);	\

	set_fs(_old_fs);				\

	_ret;						\

})



#define CODE

#include "compat_ioctl.c"



#define COMPATIBLE_IOCTL(cmd)		HANDLE_IOCTL((cmd),sys_ioctl)

#define HANDLE_IOCTL(cmd,handler)	{ (cmd), (ioctl_trans_handler_t)(handler), NULL },

#define IOCTL_TABLE_START \

	struct ioctl_trans ioctl_start[] = {

#define IOCTL_TABLE_END \

	};



IOCTL_TABLE_START

#define DECLARES

#include "compat_ioctl.c"

#include <linux/compat_ioctl.h>

IOCTL_TABLE_END



int ioctl_table_size = ARRAY_SIZE(ioctl_start);

arch/mips/kernel/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ obj-$(CONFIG_MIPS_BOARDS_GEN) += irq-msc01.o 
obj-$(CONFIG_32BIT)		+= scall32-o32.o

obj-$(CONFIG_64BIT)		+= scall64-64.o

obj-$(CONFIG_BINFMT_IRIX)	+= binfmt_irix.o

obj-$(CONFIG_MIPS32_COMPAT)	+= ioctl32.o linux32.o signal32.o

obj-$(CONFIG_MIPS32_COMPAT)	+= linux32.o signal32.o

obj-$(CONFIG_MIPS32_N32)	+= binfmt_elfn32.o scall64-n32.o signal_n32.o

obj-$(CONFIG_MIPS32_O32)	+= binfmt_elfo32.o scall64-o32.o ptrace32.o
@@ -60,6 +60,5 @@ obj-$(CONFIG_PROC_FS) += proc.o 
obj-$(CONFIG_64BIT)		+= cpu-bugs64.o



CFLAGS_cpu-bugs64.o	= $(shell if $(CC) $(CFLAGS) -Wa,-mdaddi -c -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-DHAVE_AS_SET_DADDI"; fi)

CFLAGS_ioctl32.o	+= -Ifs/



EXTRA_AFLAGS := $(CFLAGS)

arch/mips/kernel/ioctl32.c

deleted100644 → 0
+0 −50
Original line number Diff line number Diff line 
/*

 * ioctl32.c: Conversion between 32bit and 64bit native ioctls.

 *

 * Copyright (C) 2000 Silicon Graphics, Inc.

 * Written by Ulf Carlsson (ulfc@engr.sgi.com)

 * Copyright (C) 2000, 2004 Ralf Baechle

 * Copyright (C) 2002, 2003  Maciej W. Rozycki

 */

#define INCLUDES

#include "compat_ioctl.c"



#include <linux/config.h>

#include <linux/types.h>

#include <linux/compat.h>

#include <linux/ioctl32.h>

#include <linux/syscalls.h>



#ifdef CONFIG_SIBYTE_TBPROF

#include <asm/sibyte/trace_prof.h>

#endif



#define A(__x) ((unsigned long)(__x))



long sys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg);



#define CODE

#include "compat_ioctl.c"



#define COMPATIBLE_IOCTL(cmd)		HANDLE_IOCTL((cmd),sys_ioctl)

#define HANDLE_IOCTL(cmd,handler)	{ (cmd), (ioctl_trans_handler_t)(handler), NULL },

#define IOCTL_TABLE_START \

	struct ioctl_trans ioctl_start[] = {

#define IOCTL_TABLE_END \

	};



IOCTL_TABLE_START



#include <linux/compat_ioctl.h>

#define DECLARES

#include "compat_ioctl.c"



/*HANDLE_IOCTL(RTC_IRQP_READ, w_long)

COMPATIBLE_IOCTL(RTC_IRQP_SET)

HANDLE_IOCTL(RTC_EPOCH_READ, w_long)

COMPATIBLE_IOCTL(RTC_EPOCH_SET)

*/



IOCTL_TABLE_END



int ioctl_table_size = ARRAY_SIZE(ioctl_start);

arch/parisc/kernel/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ extra-y := init_task.o head.o vmlinux.lds 


AFLAGS_entry.o	:= -traditional

AFLAGS_pacache.o := -traditional

CFLAGS_ioctl32.o := -Ifs/



obj-y	     	:= cache.o pacache.o setup.o traps.o time.o irq.o \

		   pa7300lc.o syscall.o entry.o sys_parisc.o firmware.o \
@@ -19,6 +18,6 @@ obj-$(CONFIG_SMP) += smp.o 
obj-$(CONFIG_PA11)	+= pci-dma.o

obj-$(CONFIG_PCI)	+= pci.o

obj-$(CONFIG_MODULES)	+= module.o

obj-$(CONFIG_64BIT)	+= binfmt_elf32.o sys_parisc32.o ioctl32.o signal32.o

obj-$(CONFIG_64BIT)	+= binfmt_elf32.o sys_parisc32.o signal32.o

# only supported for PCX-W/U in 64-bit mode at the moment

obj-$(CONFIG_64BIT)	+= perf.o perf_asm.o