ioctl: take all 32 bits of ioctl commands into account

Historically, only 16 bits (8-bit number and 8-bit type) of 32-bit ioctl
commands were used for decoding, which was the source for numerous
annoying collisions like this:

	ioctl(0, SNDCTL_TMR_TIMEBASE or SNDRV_TIMER_IOCTL_NEXT_DEVICE or TCGETS, {B38400 opost isig icanon echo ...}) = 0
	ioctl(0, MGSL_IOCGPARAMS or MMTIMER_GETRES or MTIOCTOP or SNDCTL_MIDI_MPUMODE, 0x7fffd47f7338) = -1 ENOTTY (Inappropriate ioctl for device)

The solution is to use all 32 bits for decoding, not just "number" and
"type", but also "size" and "direction".

As some architectures override defaults that come from asm-generic/ and
provide alternative definitions for some ioctl commands, we support
per-architecture ioctl definitions and merge them with common
definitions at build time.  During the merge, we used to keep both
generic and architecture-specific definitions, now architecture-specific
definitions have precedence over generic ones -- ioctlsort omits
definitions from asm-generic/ for those ioctl names that have different
definitions in asm/.

Additional bits of "direction" are architecture specific -- the number
of bits and their values differ between architectures.  To reduce
architecture differences in the source code, we keep "direction" in
symbolic form and compile it in ioctlsort.

Additional bits of "size" are also architecture specific -- not only the
number of bits differ between architectures, but sizes of many types
depend on sizeof(long).  To reduce architecture differences in the
source code, we keep 32-bit and 64-bit versions of common ioctl
definitions, and use the appropriate version for each architecture and
personality.

To implement this, the tools for generating ioctl definitions from
kernel headers have been rewritten, and the source format of ioctl
definitions has been extended.   The final ioctlent*.h files that are
included by syscall.c are now generated from source ioctls_inc*.h and
ioctls_arch*.h files at build time with ioctlsort.

* ioctl.c (ioctl_lookup): Use all 32 bits of ioctl command code.
* ioctlsort.c: Rewritten.
* linux/32/ioctls_inc.h: New file.
* linux/64/ioctls_inc.h: New file.
* linux/aarch64/ioctls_arch0.h: New file.
* linux/aarch64/ioctls_arch1.h: New file.
* linux/aarch64/ioctls_inc0.h: New file.
* linux/aarch64/ioctls_inc1.h: New file.
* linux/alpha/ioctls_arch0.h: New file.
* linux/alpha/ioctls_inc0.h: New file.
* linux/arc/ioctls_arch0.h: New file.
* linux/arc/ioctls_inc0.h: New file.
* linux/arm/ioctls_arch0.h: New file.
* linux/arm/ioctls_inc0.h: New file.
* linux/avr32/ioctls_arch0.h: New file.
* linux/avr32/ioctls_inc0.h: New file.
* linux/bfin/ioctls_arch0.h: New file.
* linux/bfin/ioctls_inc0.h: New file.
* linux/hppa/ioctls_arch0.h: New file.
* linux/hppa/ioctls_inc0.h: New file.
* linux/i386/ioctls_arch0.h: New file.
* linux/i386/ioctls_inc0.h: New file.
* linux/ia64/ioctls_arch0.h: New file.
* linux/ia64/ioctls_inc0.h: New file.
* linux/m68k/ioctls_arch0.h: New file.
* linux/m68k/ioctls_inc0.h: New file.
* linux/metag/ioctls_arch0.h: New file.
* linux/metag/ioctls_inc0.h: New file.
* linux/microblaze/ioctls_arch0.h: New file.
* linux/microblaze/ioctls_inc0.h: New file.
* linux/mips/ioctls_arch0.h: New file.
* linux/mips/ioctls_inc0.h: New file.
* linux/or1k/ioctls_arch0.h: New file.
* linux/or1k/ioctls_inc0.h: New file.
* linux/powerpc/ioctls_arch0.h: New file.
* linux/powerpc/ioctls_inc0.h: New file.
* linux/powerpc64/ioctls_arch0.h: New file.
* linux/powerpc64/ioctls_arch1.h: New file.
* linux/powerpc64/ioctls_inc0.h: New file.
* linux/powerpc64/ioctls_inc1.h: New file.
* linux/s390/ioctls_arch0.h: New file.
* linux/s390/ioctls_inc0.h: New file.
* linux/s390x/ioctls_arch0.h: New file.
* linux/s390x/ioctls_inc0.h: New file.
* linux/sh/ioctls_arch0.h: New file.
* linux/sh/ioctls_inc0.h: New file.
* linux/sh64/ioctls_arch0.h: New file.
* linux/sh64/ioctls_inc0.h: New file.
* linux/sparc/ioctls_arch0.h: New file.
* linux/sparc/ioctls_inc0.h: New file.
* linux/sparc64/ioctls_arch0.h: New file.
* linux/sparc64/ioctls_arch2.h: New file.
* linux/sparc64/ioctls_inc0.h: New file.
* linux/sparc64/ioctls_inc2.h: New file.
* linux/tile/ioctls_arch0.h: New file.
* linux/tile/ioctls_arch1.h: New file.
* linux/tile/ioctls_inc0.h: New file.
* linux/tile/ioctls_inc1.h: New file.
* linux/x32/ioctls_arch0.h: New file.
* linux/x32/ioctls_arch1.h: New file.
* linux/x32/ioctls_inc0.h: New file.
* linux/x32/ioctls_inc1.h: New file.
* linux/x86_64/ioctls_arch0.h: New file.
* linux/x86_64/ioctls_arch1.h: New file.
* linux/x86_64/ioctls_inc0.h: New file.
* linux/x86_64/ioctls_inc1.h: New file.
* linux/xtensa/ioctls_arch0.h: New file.
* linux/xtensa/ioctls_inc0.h: New file.
* linux/aarch64/ioctlent.h.in: Remove.
* linux/aarch64/ioctlent1.h: Remove.
* linux/alpha/ioctlent.h.in: Remove.
* linux/arc/ioctlent.h.in: Remove.
* linux/arm/ioctlent.h.in: Remove.
* linux/avr32/ioctlent.h.in: Remove.
* linux/bfin/ioctlent.h.in: Remove.
* linux/hppa/ioctlent.h.in: Remove.
* linux/i386/ioctlent.h.in: Remove.
* linux/ia64/ioctlent.h.in: Remove.
* linux/ioctlent.h.in: Remove.
* linux/ioctlent.sh: Remove.
* linux/m68k/ioctlent.h.in: Remove.
* linux/metag/ioctlent.h.in: Remove.
* linux/microblaze/ioctlent.h.in: Remove.
* linux/mips/ioctlent.h.in: Remove.
* linux/mips/ioctlent.sh: Remove.
* linux/or1k/ioctlent.h.in: Remove.
* linux/powerpc/ioctlent.h.in: Remove.
* linux/powerpc64/ioctlent.h: Remove.
* linux/powerpc64/ioctlent1.h: Remove.
* linux/s390/ioctlent.h.in: Remove.
* linux/s390x/ioctlent.h.in: Remove.
* linux/sh/ioctlent.h.in: Remove.
* linux/sh64/ioctlent.h.in: Remove.
* linux/sparc/ioctlent.h.in: Remove.
* linux/sparc64/ioctlent.h.in: Remove.
* linux/sparc64/ioctlent2.h: Remove.
* linux/tile/ioctlent.h.in: Remove.
* linux/tile/ioctlent1.h: Remove.
* linux/x32/ioctlent.h.in: Remove.
* linux/x32/ioctlent1.h: Remove.
* linux/x86_64/ioctlent.h.in: Remove.
* linux/x86_64/ioctlent1.h: Remove.
* linux/xtensa/ioctlent.h.in: Remove.
* linux/x86_64/ioctlent2.h: Include ioctlent0.h instead of ioctlent.h.
* syscall.c (struct_ioctlent ioctlent0): Likewise.
* Makefile.am: Remove all ioctlent-related definitions.
Define the list of ioctlent*.h files that have to be generated by
presence of $(srcdir)/$(OS)/$(ARCH)/ioctls_inc*.h files.
Add rules for ioctlent*.h files generation.
(EXTRA_DIST): Update.
* maint/ioctls_gen.sh: New file.
* maint/ioctls_hex.sh: New file.
* maint/ioctls_sym.sh: New file.
* maint/print_ioctlent.c: New file.
* HACKING-scripts: Update for ioctlent.sh -> ioctls_gen.sh migration.
* .gitignore: Add ioctlent[012].h and ioctls_all[012].h.
* configure.ac (AC_CHECK_HEADERS): Add linux/hiddev.h
and linux/mmtimer.h for tests.
* tests/ioctl.c: New file.
* tests/ioctl.test: New test.
* tests/Makefile.am (check_PROGRAMS): Add ioctl.
(TESTS): Add ioctl.test.
* tests/.gitignore: Add ioctl.

Author: ldv-alt

.gitignore

@@ -35,6 +35,7 @@ Makefile.in
 /strace
 /test-driver
 
-/linux/ioctlent.h
+/ioctlent[012].h
+/ioctls_all[012].h
 
 /strace-*.tar.xz

HACKING-scripts

@@ -14,38 +14,38 @@ architecture to be specific).  Hopefully, it'll be obvious how to swap out a
 different system or architecture as your circumstances apply.
 
 ksrc=/usr/src/linux
-asrc=$ksrc/arch/blackfin/include/asm
+asrc=$ksrc/arch/blackfin/include
 
 To use the errnoent.sh script, give it all the headers that might contain
 appropriate errno values.  Excessive headers are not a problem.  The resulting
 output should be directly usable without modification.
 	sh ./errnoent.sh \
 		$ksrc/include/linux/*errno*.h \
 		$ksrc/include/asm-generic/*errno*.h \
-		$asrc/*errno*.h \
+		$asrc/asm/*errno*.h \
 		> errnoent.h
 
-To use the ioctlent.sh script, give it all the base include directories.  The
+To use the ioctls_gen.sh script, give it all the base include directories.  The
 script will crawl all the headers and try to discover appropriate ioctls.
 Unlike the other scripts, this one creates files for further processing.  This
-is because ioctls tend to have a lot of define indirection, and the ioctlent.h
+is because ioctls tend to have a lot of define indirection, and the ioctlent0.h
 header needs to be fully expanded into numeric form and sorted properly.  So
-first we process all of the ioctls with the ioctlent.sh into ioctldefs.h and
-ioctls.h, and then we compile them into ioctlsort.c.  The resulting output,
-while directly usable, only contains definitions that match exactly the current
-kernel version that the script ran against.  That means older/newer ioctl
-defines that might be present in the existing ioctlent.h header will be lost if
-things are copied directly.  A little creative use of `diff` and manual merging
-should be used to produce the final ioctlent.h header.
-	sh ./linux/ioctlent.sh $ksrc/include $asrc
-	gcc -Wall -I. linux/ioctlsort.c -o ioctlsort
-	./ioctlsort > ioctlent.h
+first we process all of the ioctls with the ioctls_gen.sh into ioctls_inc.h and
+ioctls_arch.h, and then we compile them into ioctlsort.c.  The resulting
+output, while directly usable, only contains definitions that match exactly the
+current kernel version that the script ran against.  That means older/newer
+ioctl defines that might be present in the existing ioctlent0.h header will be
+lost if things are copied directly.  A little creative use of `diff` and manual
+merging should be used to produce the final ioctlent0.h header.
+	sh ./maint/ioctls_gen.sh $ksrc/include $asrc
+	gcc -Wall -I. ioctlsort.c -o ioctlsort
+	./ioctlsort > ioctlent0.h
 
 To use the signalent.sh script, give it all the headers that might contain
 appropriate signal values.  Excessive headers are not a problem.  The resulting
 output should be directly usable without modification.
 	sh ./signalent.sh \
-		$asrc/signal.h \
+		$asrc/asm/signal.h \
 		> signalent.h
 
 To use the syscallent.sh script, give it the header with the list of your
@@ -54,5 +54,5 @@ a proper header as it can really only detect the system call number and its
 name.  It has no way of knowing the number of arguments or strace flags for
 decoding them (yet?).
 	sh ./syscallent.sh \
-		$asrc/unistd.h \
+		$asrc/asm/unistd.h \
 		> syscallent.h

Makefile.am

@@ -147,28 +147,37 @@ EXTRA_DIST =				\
 	debian/watch			\
 	errnoent.sh			\
 	ioctlsort.c			\
+	linux/32/ioctls_inc.h		\
 	linux/32/syscallent.h		\
+	linux/64/ioctls_inc.h		\
 	linux/64/syscallent.h		\
 	linux/aarch64/errnoent1.h	\
-	linux/aarch64/ioctlent.h.in	\
-	linux/aarch64/ioctlent1.h	\
+	linux/aarch64/ioctls_arch0.h	\
+	linux/aarch64/ioctls_arch1.h	\
+	linux/aarch64/ioctls_inc0.h	\
+	linux/aarch64/ioctls_inc1.h	\
 	linux/aarch64/signalent1.h	\
 	linux/aarch64/syscallent.h	\
 	linux/aarch64/syscallent1.h	\
 	linux/alpha/errnoent.h		\
-	linux/alpha/ioctlent.h.in	\
+	linux/alpha/ioctls_arch0.h	\
+	linux/alpha/ioctls_inc0.h	\
 	linux/alpha/signalent.h		\
 	linux/alpha/syscallent.h	\
 	linux/alpha/userent.h		\
-	linux/arc/ioctlent.h.in		\
+	linux/arc/ioctls_arch0.h	\
+	linux/arc/ioctls_inc0.h		\
 	linux/arc/syscallent.h		\
-	linux/arm/ioctlent.h.in		\
+	linux/arm/ioctls_arch0.h	\
+	linux/arm/ioctls_inc0.h		\
 	linux/arm/syscallent.h		\
 	linux/arm/userent.h		\
-	linux/avr32/ioctlent.h.in	\
+	linux/avr32/ioctls_arch0.h	\
+	linux/avr32/ioctls_inc0.h	\
 	linux/avr32/syscallent.h	\
 	linux/avr32/userent.h		\
-	linux/bfin/ioctlent.h.in	\
+	linux/bfin/ioctls_arch0.h	\
+	linux/bfin/ioctls_inc0.h	\
 	linux/bfin/syscallent.h		\
 	linux/bfin/userent.h		\
 	linux/crisv10/userent.h		\
@@ -177,35 +186,39 @@ EXTRA_DIST =				\
 	linux/errnoent.h		\
 	linux/fanotify.h		\
 	linux/hppa/errnoent.h		\
-	linux/hppa/ioctlent.h.in	\
+	linux/hppa/ioctls_arch0.h	\
+	linux/hppa/ioctls_inc0.h	\
 	linux/hppa/signalent.h		\
 	linux/hppa/syscallent.h		\
-	linux/i386/ioctlent.h.in	\
+	linux/i386/ioctls_arch0.h	\
+	linux/i386/ioctls_inc0.h	\
 	linux/i386/syscallent.h		\
 	linux/i386/userent.h		\
 	linux/i386/userent0.h		\
-	linux/ia64/ioctlent.h.in	\
+	linux/ia64/ioctls_arch0.h	\
+	linux/ia64/ioctls_inc0.h	\
 	linux/ia64/signalent.h		\
 	linux/ia64/syscallent.h		\
 	linux/ia64/userent.h		\
 	linux/inet_diag.h		\
 	linux/inotify.h			\
-	linux/ioctlent.h.in		\
-	linux/ioctlent.sh		\
 	linux/kexec.h			\
 	linux/keyctl.h			\
-	linux/m68k/ioctlent.h.in	\
+	linux/m68k/ioctls_arch0.h	\
+	linux/m68k/ioctls_inc0.h	\
 	linux/m68k/syscallent.h		\
 	linux/m68k/userent.h		\
-	linux/metag/ioctlent.h.in	\
+	linux/metag/ioctls_arch0.h	\
+	linux/metag/ioctls_inc0.h	\
 	linux/metag/syscallent.h	\
-	linux/microblaze/ioctlent.h.in	\
+	linux/microblaze/ioctls_arch0.h	\
+	linux/microblaze/ioctls_inc0.h	\
 	linux/microblaze/syscallent.h	\
 	linux/microblaze/userent.h	\
 	linux/mips/errnoent.h		\
 	linux/mips/genstub.sh		\
-	linux/mips/ioctlent.h.in	\
-	linux/mips/ioctlent.sh		\
+	linux/mips/ioctls_arch0.h	\
+	linux/mips/ioctls_inc0.h	\
 	linux/mips/signalent.h		\
 	linux/mips/syscallent-compat.h	\
 	linux/mips/syscallent-n32.h	\
@@ -214,35 +227,43 @@ EXTRA_DIST =				\
 	linux/mips/syscallent.h		\
 	linux/mips/userent.h		\
 	linux/mtd-abi.h			\
-	linux/or1k/ioctlent.h.in	\
+	linux/or1k/ioctls_arch0.h	\
+	linux/or1k/ioctls_inc0.h	\
 	linux/or1k/syscallent.h		\
 	linux/or1k/userent.h		\
 	linux/personality.h		\
-	linux/powerpc/ioctlent.h.in	\
+	linux/powerpc/ioctls_arch0.h	\
+	linux/powerpc/ioctls_inc0.h	\
 	linux/powerpc/syscallent.h	\
 	linux/powerpc/userent.h		\
 	linux/powerpc64/errnoent1.h	\
-	linux/powerpc64/ioctlent.h	\
-	linux/powerpc64/ioctlent1.h	\
+	linux/powerpc64/ioctls_arch0.h	\
+	linux/powerpc64/ioctls_arch1.h	\
+	linux/powerpc64/ioctls_inc0.h	\
+	linux/powerpc64/ioctls_inc1.h	\
 	linux/powerpc64/signalent1.h	\
 	linux/powerpc64/syscallent.h	\
 	linux/powerpc64/syscallent1.h	\
 	linux/powerpc64/userent.h	\
 	linux/ptp_clock.h		\
 	linux/reboot.h			\
-	linux/s390/ioctlent.h.in	\
+	linux/s390/ioctls_arch0.h	\
+	linux/s390/ioctls_inc0.h	\
 	linux/s390/syscallent.h		\
 	linux/s390/userent.h		\
 	linux/s390/userent0.h		\
 	linux/s390/userent1.h		\
-	linux/s390x/ioctlent.h.in	\
+	linux/s390x/ioctls_arch0.h	\
+	linux/s390x/ioctls_inc0.h	\
 	linux/s390x/syscallent.h	\
 	linux/s390x/userent.h		\
-	linux/sh/ioctlent.h.in		\
+	linux/sh/ioctls_arch0.h		\
+	linux/sh/ioctls_inc0.h		\
 	linux/sh/syscallent.h		\
 	linux/sh/userent.h		\
 	linux/sh/userent0.h		\
-	linux/sh64/ioctlent.h.in	\
+	linux/sh64/ioctls_arch0.h	\
+	linux/sh64/ioctls_inc0.h	\
 	linux/sh64/syscallent.h		\
 	linux/sh64/userent.h		\
 	linux/signalent.h		\
@@ -251,8 +272,9 @@ EXTRA_DIST =				\
 	linux/sparc/errnoent.h		\
 	linux/sparc/errnoent1.h		\
 	linux/sparc/gen.pl		\
-	linux/sparc/ioctlent.h.in	\
 	linux/sparc/ioctlent1.h		\
+	linux/sparc/ioctls_arch0.h	\
+	linux/sparc/ioctls_inc0.h	\
 	linux/sparc/signalent.h		\
 	linux/sparc/signalent1.h	\
 	linux/sparc/syscall1.h		\
@@ -263,9 +285,11 @@ EXTRA_DIST =				\
 	linux/sparc64/errnoent.h	\
 	linux/sparc64/errnoent1.h	\
 	linux/sparc64/errnoent2.h	\
-	linux/sparc64/ioctlent.h.in	\
 	linux/sparc64/ioctlent1.h	\
-	linux/sparc64/ioctlent2.h	\
+	linux/sparc64/ioctls_arch0.h	\
+	linux/sparc64/ioctls_arch2.h	\
+	linux/sparc64/ioctls_inc0.h	\
+	linux/sparc64/ioctls_inc2.h	\
 	linux/sparc64/signalent.h	\
 	linux/sparc64/signalent1.h	\
 	linux/sparc64/signalent2.h	\
@@ -277,8 +301,10 @@ EXTRA_DIST =				\
 	linux/subcall.h			\
 	linux/syscall.h			\
 	linux/tile/errnoent1.h		\
-	linux/tile/ioctlent.h.in	\
-	linux/tile/ioctlent1.h		\
+	linux/tile/ioctls_arch0.h	\
+	linux/tile/ioctls_arch1.h	\
+	linux/tile/ioctls_inc0.h	\
+	linux/tile/ioctls_inc1.h	\
 	linux/tile/signalent1.h		\
 	linux/tile/syscallent.h		\
 	linux/tile/syscallent1.h	\
@@ -289,8 +315,10 @@ EXTRA_DIST =				\
 	linux/userent0.h		\
 	linux/x32/errnoent.h		\
 	linux/x32/errnoent1.h		\
-	linux/x32/ioctlent.h.in		\
-	linux/x32/ioctlent1.h		\
+	linux/x32/ioctls_arch0.h	\
+	linux/x32/ioctls_arch1.h	\
+	linux/x32/ioctls_inc0.h		\
+	linux/x32/ioctls_inc1.h		\
 	linux/x32/signalent.h		\
 	linux/x32/signalent1.h		\
 	linux/x32/syscallent.h		\
@@ -299,18 +327,25 @@ EXTRA_DIST =				\
 	linux/x86_64/errnoent1.h	\
 	linux/x86_64/errnoent2.h	\
 	linux/x86_64/gentab.pl		\
-	linux/x86_64/ioctlent.h.in	\
-	linux/x86_64/ioctlent1.h	\
 	linux/x86_64/ioctlent2.h	\
+	linux/x86_64/ioctls_arch0.h	\
+	linux/x86_64/ioctls_arch1.h	\
+	linux/x86_64/ioctls_inc0.h	\
+	linux/x86_64/ioctls_inc1.h	\
 	linux/x86_64/signalent1.h	\
 	linux/x86_64/signalent2.h	\
 	linux/x86_64/syscallent.h	\
 	linux/x86_64/syscallent1.h	\
 	linux/x86_64/syscallent2.h	\
 	linux/x86_64/userent.h		\
-	linux/xtensa/ioctlent.h.in	\
+	linux/xtensa/ioctls_arch0.h	\
+	linux/xtensa/ioctls_inc0.h	\
 	linux/xtensa/syscallent.h	\
 	linux/xtensa/userent.h		\
+	maint/ioctls_gen.sh		\
+	maint/ioctls_hex.sh		\
+	maint/ioctls_sym.sh		\
+	maint/print_ioctlent.c		\
 	signalent.sh			\
 	strace-graph			\
 	strace-log-merge		\
@@ -346,16 +381,30 @@ news-check: NEWS
 		exit 1;						\
 	fi
 
-ioctlent_h = $(builddir)/$(OS)/ioctlent.h
+ioctlsort_CC = $(CC)
+ioctlsort_DEFS = $(DEFS)
+ioctlsort_INCLUDES = $(DEFAULT_INCLUDES) $(INCLUDES)
+ioctlsort_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS)
+ioctlsort_CFLAGS = $(AM_CFLAGS) $(CFLAGS)
+ioctlsort_LD = $(CCLD)
+ioctlsort_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS)
+
+ioctls_inc_h = $(wildcard $(srcdir)/$(OS)/$(ARCH)/ioctls_inc*.h)
+ioctlent_h = $(patsubst $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%,ioctlent%,$(ioctls_inc_h))
 BUILT_SOURCES += $(ioctlent_h)
 CLEANFILES = $(ioctlent_h)
-ioctlent_h_deps = $(srcdir)/$(OS)/ioctlent.h.in $(srcdir)/$(OS)/$(ARCH)/ioctlent.h.in
-$(ioctlent_h): $(top_builddir)/config.status $(ioctlent_h_deps)
-	$(MKDIR_P) $(builddir)/$(OS)
-	cat $(ioctlent_h_deps) | \
-		$(COMPILE) -E -P - | \
-		sed 's/^\([[:space:]]*{\)"[^"]\+",[[:space:]]*/\1/' | \
-		LC_ALL=C sort -u -k2,2 -k1,1 > $@
+
+ioctlent%.h: ioctlsort%
+	./$< > $@
+
+ioctlsort%: ioctlsort%.o
+	$(ioctlsort_LD) $(ioctlsort_LDFLAGS) $< -o $@
+
+ioctlsort%.o: ioctls_all%.h $(srcdir)/ioctlsort.c
+	$(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c
+
+ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h
+	cat $^ > $@
 
 if MAINTAINER_MODE
 
@@ -385,28 +434,4 @@ $(srcdir)/CREDITS: $(srcdir)/CREDITS.in $(srcdir)/.mailmap \
 
 export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner --mode=go-w,go+rX
 
-INCLUDEDIR = /usr/include
-KERNEL_RELEASE = $(shell uname -r)
-# Candidates for the kernel headers tree.
-KERNEL_INCLUDE = \
-	/lib/modules/$(KERNEL_RELEASE)/build/include \
-	/usr/src/linux-$(KERNEL_RELEASE)/include \
-	$(INCLUDEDIR)
-IOCTLDIR = $(shell find $(KERNEL_INCLUDE) -maxdepth 0 -type d -print -quit 2>/dev/null)
-IOCTLASM = $(INCLUDEDIR)/asm
-
-noinst_PROGRAMS = ioctlsort
-ioctlsort_SOURCES = ioctlsort.c
-nodist_ioctlsort_SOURCES = ioctls.h ioctldefs.h
-CLEANFILES += $(nodist_ioctlsort_SOURCES)
-ioctlsort.$(OBJEXT): $(nodist_ioctlsort_SOURCES)
-ioctls.h: $(srcdir)/linux/ioctlent.sh
-	$(SHELL) $< $(IOCTLDIR) $(IOCTLASM)
-ioctldefs.h: ioctls.h ;
-
-ioctlent_h_in = linux/ioctlent.h.in
-BUILT_SOURCES += $(ioctlent_h_in)
-$(srcdir)/$(ioctlent_h_in): ioctlsort
-	$(<D)/$(<F) > $@
-
 endif

configure.ac

@@ -223,7 +223,9 @@ AC_CHECK_HEADERS(m4_normalize([
 	inttypes.h
 	ioctls.h
 	linux/falloc.h
+	linux/hiddev.h
 	linux/input.h
+	linux/mmtimer.h
 	linux/perf_event.h
 	linux/ptrace.h
 	linux/utsname.h

ioctl.c

@@ -48,11 +48,10 @@ compare(const void *a, const void *b)
 }
 
 const struct_ioctlent *
-ioctl_lookup(unsigned int code)
+ioctl_lookup(const unsigned int code)
 {
 	struct_ioctlent *iop;
 
-	code &= (_IOC_NRMASK<<_IOC_NRSHIFT) | (_IOC_TYPEMASK<<_IOC_TYPESHIFT);
 	iop = bsearch((const void *) (const unsigned long) code, ioctlent,
 			nioctlents, sizeof(ioctlent[0]), compare);
 	while (iop > ioctlent) {