Prepare for 4.7 release

* configure.ac: Version 4.7. * debian/changelog: 4.7-1. * strace.spec: 4.7-1.
Fix build with <linux/loop.h> from 2.6.18 kernel headers
2012-05-02 12:34:56 +00:00 · 2012-05-02 10:21:49 +00:00 · 2012-05-01 22:49:49 +00:00 · 2012-05-01 21:51:38 +00:00 · 2012-05-01 21:32:09 +00:00 · 2012-05-01 21:17:51 +00:00
220 changed files with 25317 additions and 42286 deletions
--- a/.gitignore
+++ b/.gitignore
@ -4,7 +4,8 @@
 .libs
 .*.swp

-ChangeLog
+/ChangeLog
+/CREDITS

 Makefile
 Makefile.in
@ -24,5 +25,11 @@ Makefile.in
 /stamp-h1

 /*.gdb
+/ioctls.h
+/ioctldefs.h
 /ioctlsort
 /strace
+
+/linux/ioctlent.h
+
+/strace-*.tar.xz
--- a/.mailmap
+++ b/.mailmap
@ -0,0 +1,6 @@
+# Map git author names and email addresses to canonical/preferred form.
+<ak@linux.intel.com>	<ak@suse.de>
+<holger@freyther.de>	<zecke@selfish.org>
+<schwab@linux-m68k.org>	<schwab@redhat.com>
+<schwab@linux-m68k.org>	<schwab@suse.de>
+<vda.linux@googlemail.com>	<dvlasenk@redhat.com>
--- a/2
+++ b/2
@ -27,5 +27,3 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-$Id$
--- a/49
+++ b/49
@ -1,49 +0,0 @@
-The primary authors of strace are:
-
-	Paul Kranenburg <pk@cs.few.eur.nl>
-	Branko Lankester <branko@hacktic.nl>
-	Rick Sladkey <jrs@world.std.com>
-
-Thanks to the follow people for contributing to strace by reporting
-bugs, providing fixes, providing information, providing resources or
-porting to new systems:
-
-	Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
-	Arkadiusz Miskiewicz <misiek@pld.org.pl>
-	Marty Leisner <leisner@sdsp.mc.xerox.com>
-	Lupe Christoph <lupe@alanya.isar.muc.de>
-	Thanh Ma <tma@encore.com>
-	Keith Thompson <kst@alsys.com>
-	Roland Borde <bo@uebemc.siemens.de>
-	Matt Day <mday@artisoft.com>
-	Joe Ilacqua <spike@world.std.com>
-	Ju"rgen Fluk <louis@marco.de>
-	Bo Kullmar <bk@kullmar.se>
-	Leonard N. Zubkoff <lnz@dandelion.com>
-	Reuben Sumner <rasumner@undergrad.math.uwaterloo.ca>
-	Juergen Weigert <jnweiger@immd4.informatik.uni-erlangen.de>
-	Linus Torvalds <Linus.Torvalds@cs.Helsinki.FI>
-	Michael E Chastain <mec@duracef.shout.net>
-	Aaron Ucko <UCKO@VAX1.ROCKHURST.EDU>
-	David S. Miller <davem@caip.rutgers.edu>
-	Matthias Pfaller <leo@dachau.marco.de>
-	Thomas Bogendoerfer <tsbogend@bigbug.franken.de>
-	Richard Henderson <richard@twiddle.tamu.edu>
-	Tom Dyas <tdyas@eden.rutgers.edu>
-	Henrik Storner <storner@osiris.ping.dk>
-	David Mosberger-Tang <davidm@hpl.hp.com>
-	Ulrich Drepper <drepper@cygnus.com>
-	Nate Eldredge <nate@cartsys.com>
-	Jakub Jelinek <jj@ultra.linux.cz>
-	John Hughes <john@Calva.COM>
-	Richard Braakman <dark@xs4all.nl>
-	Florian Lohoff <flo@rfc822.org>
-	D.J. Barrow <djbarrow@de.ibm.com>
-	Topi Miettinen <Topi.Miettinen@nic.fi>
-	Gaël Roualland <gael.roualland@iname.com>
-	Richard Hirst <rhirst@linuxcare.com>
-	Ganesan Rajagopal <rganesan@myrealbox.com>
-	Greg Banks <gbanks@pocketpenguins.com>
-	Andi Kleen <ak@suse.de>
-	Michal Ludvig <mludvig@suse.cz>
-	Heiko Carstens <heiko.carstens@de.ibm.com>
--- a/CREDITS.in
+++ b/CREDITS.in
@ -0,0 +1,90 @@
+The primary authors of strace were:
+
+	Paul Kranenburg <pk@cs.few.eur.nl>
+	Branko Lankester <branko@hacktic.nl>
+	Rick Sladkey <jrs@world.std.com>
+
+These people have contributed to strace.  Some have reported problems, others
+have contributed improvements to the documentation, actual code, provided
+information, provided resources, or helped to port strace to new systems.
+Those contributions are described in the version control logs and ChangeLog-CVS
+file.  If your name has been left out, if you'd rather not be listed, or if
+you'd prefer a different address be used, please send a note to the
+strace-devel@lists.sourceforge.net mailing list.
+
+##<
+## There is no need to list here any name that appears as an Author in
+## "git log" output.  Those are automatically added when this template
+## is used to generate the CREDITS file.
+##>
+Aaron Ucko                      ucko@vax1.rockhurst.edu
+Adrien Kunysz                   adrien@kunysz.be
+Anton Blanchard                 anton@samba.org
+Arkadiusz Miskiewicz            misiek@pld.org.pl
+Bai Weidong                     baiwd@cn.fujitsu.com
+Bo Kullmar                      bk@kullmar.se
+Cai Fei                         caifei@cn.fujitsu.com
+D.J. Barrow                     djbarrow@de.ibm.com
+David Mosberger-Tang            davidm@hpl.hp.com
+David S. Miller                 davem@caip.rutgers.edu
+David Wilder                    wilder@us.ibm.com
+David Woodhouse                 dwmw2@redhat.com
+Douglas Mencken                 dougmencken@gmail.com
+Fernando Luis Vazquez Cao       fernando@oss.ntt.co.jp
+Florian Lohoff                  flo@rfc822.org
+Gabor Gombas                    gombasg@sztaki.hu
+Ganesan Rajagopal               rganesan@myrealbox.com
+Gaël Roualland                  gael.roualland@iname.com
+Greg Banks                      gbanks@pocketpenguins.com
+Henrik Storner                  storner@osiris.ping.dk
+Jakub Jelinek                   jj@ultra.linux.cz
+Jeff Mahoney                    jeffm@suse.com
+Joe Ilacqua                     spike@world.std.com
+Johannes Stezenbach             js@sig21.net
+Ju"rgen Fluk                    louis@marco.de
+Juergen Weigert                 jnweiger@immd4.informatik.uni-erlangen.de
+Keith Thompson                  kst@alsys.com
+Kyle McMartin                   kyle@mcmartin.ca
+Lai JiangShan                   laijs@cn.fujitsu.com
+Leonard N. Zubkoff              lnz@dandelion.com
+Linus Torvalds                  Linus.Torvalds@cs.helsinki.fi
+Lupe Christoph                  lupe@alanya.isar.muc.de
+Marty Leisner                   leisner@sdsp.mc.xerox.com
+Matt Day                        mday@artisoft.com
+Matthias Pfaller                leo@dachau.marco.de
+Maxim Shchetynin                maxim@de.ibm.com
+Michael E Chastain              mec@duracef.shout.net
+Michael Holzheu                 holzheu@de.ibm.com
+Michail Litvak                  mci@owl.openwall.com
+Mike Stroyan                    mike.stroyan@hp.com
+Muttley Meen                    muttley.meen@gmail.com
+Nate Eldredge                   nate@cartsys.com
+Paul Mundt                      lethal@linux-sh.org
+Peter Jones                     pjones@redhat.com
+Pádraig Brady                   P@draigBrady.com
+Rajeev V. Pillai                rajeevvp@gmail.com
+Randolph Chung                  tausq@debian.org
+Reuben Sumner                   rasumner@undergrad.math.uwaterloo.ca
+Richard Braakman                dark@xs4all.nl
+Richard Henderson               richard@twiddle.tamu.edu
+Richard Hirst                   rhirst@linuxcare.com
+Roland Borde                    bo@uebemc.siemens.de
+Sami Farin                      safari@u.safari.iki.fi
+Scott Tsai                      scottt958@yahoo.com.tw
+Simon Murray                    simon@transitive.com
+Solar Designer                  solar@openwall.com
+Srinivasa Ds                    srinivasa@in.ibm.com
+Steve Bennett                   steveb@workware.net.au
+Thanh Ma                        tma@encore.com
+Thiemo Seufer                   ths@networkno.de
+Thomas Bogendoerfer             tsbogend@bigbug.franken.de
+Tim Yamin                       plasmaroo@gentoo.org
+Timo Lindfors                   timo.lindfors@iki.fi
+Tom Dyas                        tdyas@eden.rutgers.edu
+Tommi Rantala                   ext-tommi.1.rantala@nokia.com
+Topi Miettinen                  Topi.Miettinen@nic.fi
+Xiaoning Ding                   dingxn@gmail.com
+Yang Zhiguo                     yzgcsu@cn.fujitsu.com
+Zach Brown                      zach.brown@oracle.com
+Zhang Le                        zhilg@users.sourceforge.net
+Марк Коренберг                  socketpair@gmail.com
--- a/284
+++ b/284
@ -1,48 +1,80 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation,
+Inc.
+
+Copying and distribution of this file, with or without modification, are
+permitted in any medium without royalty provided the copyright notice
+and this notice are preserved.  This file is offered as-is, without
+warranty of any kind.
+
 Basic Installation
 ==================

-   These are generic installation instructions.
+Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.  Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.

   The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
 those values to create a `Makefile' in each directory of the package.
 It may also create one or more `.h' files containing system-dependent
 definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, a file
-`config.cache' that saves the results of its tests to speed up
-reconfiguring, and a file `config.log' containing compiler output
-(useful mainly for debugging `configure').
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.

   If you need to do unusual things to compile the package, please try
 to figure out how `configure' could check whether to do them, and mail
 diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If at some point `config.cache'
-contains results you don't want to keep, you may remove or edit it.
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.

-   The file `configure.in' is used to create `configure' by a program
-called `autoconf'.  You only need `configure.in' if you want to change
-it or regenerate `configure' using a newer version of `autoconf'.
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.

 The simplest way to compile this package is:

  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
+     `./configure' to configure the package for your system.

-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.

  2. Type `make' to compile the package.

  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
+     the package, generally using the just-built uninstalled binaries.

  4. Type `make install' to install the programs and any data files and
-     documentation.
+     documentation.  When installing into a prefix owned by root, it is
+     recommended that the package be configured and built as a regular
+     user, and only the `make install' phase executed with root
+     privileges.

-  5. You can remove the program binaries and object files from the
+  5. Optionally, type `make installcheck' to repeat any self-tests, but
+     this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior `make install' required
+     root privileges, verifies that the installation completed
+     correctly.
+
+  6. You can remove the program binaries and object files from the
     source code directory by typing `make clean'.  To also remove the
     files that `configure' created (so you can compile the package for
     a different kind of computer), type `make distclean'.  There is
@ -51,62 +83,89 @@ The simplest way to compile this package is:
     all sorts of other programs in order to regenerate files that came
     with the distribution.

+  7. Often, you can also type `make uninstall' to remove the installed
+     files again.  In practice, not all packages have tested that
+     uninstallation works correctly, even though it is required by the
+     GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide `make
+     distcheck', which can by used by developers to test that all other
+     targets like `make install' and `make uninstall' work correctly.
+     This target is generally not run by end users.
+
 Compilers and Options
 =====================

-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  You can give `configure'
-initial values for variables by setting them in the environment.  Using
-a Bourne-compatible shell, you can do that on the command line like
-this:
-     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about.  Run `./configure --help' for
+details on some of the pertinent environment variables.

-Or on systems that have the `env' program, you can do it like this:
-     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:

-Compiling For Multiple Architectures
-====================================
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix

-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not supports the `VPATH'
-variable, you have to compile the package for one architecture at a time
-in the source code directory.  After you have installed the package for
-one architecture, use `make distclean' before reconfiguring for another
-architecture.
+   *Note Defining Variables::, for more details.

 Installation Names
 ==================

-   By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.

   You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.

   In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
+options like `--bindir=DIR' to specify different values for particular
 kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
+you can set and what kinds of files go in them.  In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.

-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+   The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+   The first method involves providing an override variable for each
+affected directory.  For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'.  Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated.  The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the `DESTDIR' variable.  For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names.  The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters.  On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.

 Optional Features
 =================

+If the package supports it, you can cause programs to be installed with
+an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
   Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
@ -119,62 +178,125 @@ find the X include and library files automatically, but if it doesn't,
 you can use the `configure' options `--x-includes=DIR' and
 `--x-libraries=DIR' to specify their locations.

+   Some packages offer the ability to configure how verbose the
+execution of `make' will be.  For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
 Specifying the System Type
 ==========================

-   There may be some features `configure' can not figure out
-automatically, but needs to determine by the type of host the package
-will run on.  Usually `configure' can figure that out, but if it prints
-a message saying it can not guess the host type, give it the
-`--host=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name with three fields:
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
     CPU-COMPANY-SYSTEM

+where SYSTEM can have one of these forms:
+
+     OS
+     KERNEL-OS
+
 See the file `config.sub' for the possible values of each field.  If
 `config.sub' isn't included in this package, then this package doesn't
-need to know the host type.
+need to know the machine type.

-   If you are building compiler tools for cross-compiling, you can also
-use the `--target=TYPE' option to select the type of system they will
-produce code for and the `--build=TYPE' option to select the type of
-system on which you are compiling the package.
+   If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.

 Sharing Defaults
 ================

-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
 `configure' looks for `PREFIX/share/config.site' if it exists, then
 `PREFIX/etc/config.site' if it exists.  Or, you can set the
 `CONFIG_SITE' environment variable to the location of the site script.
 A warning: not all `configure' scripts look for a site script.

-Operation Controls
+Defining Variables
 ==================

-   `configure' recognizes the following options to control how it
-operates.
+Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:

-`--cache-file=FILE'
-     Use and save the results of the tests in FILE instead of
-     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
-     debugging `configure'.
+     ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf limitation.  Until the limitation is lifted, you can use
+this workaround:
+
+     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+`configure' recognizes the following options to control how it operates.

 `--help'
-     Print a summary of the options to `configure', and exit.
+`-h'
+     Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+     Print a summary of the options unique to this package's
+     `configure', and exit.  The `short' variant lists options used
+     only in the top level, while the `recursive' variant lists options
+     also present in any nested packages.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.

 `--quiet'
 `--silent'
 `-q'
-     Do not print messages saying which checks are being made.
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).

 `--srcdir=DIR'
     Look for the package's source code in directory DIR.  Usually
     `configure' can determine that directory automatically.

-`--version'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
+`--prefix=DIR'
+     Use DIR as the installation prefix.  *note Installation Names::
+     for more details, including other options available for fine-tuning
+     the installation locations.

-`configure' also accepts some other, not widely useful, options.
+`--no-create'
+`-n'
+     Run the configure checks, but stop before creating any output
+     files.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
--- a/Makefile.am
+++ b/Makefile.am
@ -1,91 +1,101 @@
 # Automake input for strace.

+SUBDIRS = tests
+
 bin_PROGRAMS = strace
 man_MANS = strace.1
-bin_SCRIPTS = strace-graph
+bin_SCRIPTS = strace-graph strace-log-merge

-# OS is one of `linux', `sunos4', `svr4', or `freebsd'.
-OS		= @opsys@
+OS		= linux
 # ARCH is `i386', `m68k', `sparc', etc.
 ARCH		= @arch@

-AM_CFLAGS = $(WARNFLAGS)
-INCLUDES = -I$(OS)/$(ARCH) -I$(srcdir)/$(OS)/$(ARCH) -I$(OS) -I$(srcdir)/$(OS)
+ACLOCAL_AMFLAGS = -I m4
+AM_CFLAGS = $(WARN_CFLAGS)
+AM_CPPFLAGS = -I$(srcdir)/$(OS)/$(ARCH) -I$(srcdir)/$(OS) -I$(builddir)/$(OS)

 strace_SOURCES = strace.c syscall.c count.c util.c desc.c file.c ipc.c \
 		 io.c ioctl.c mem.c net.c process.c bjm.c quota.c \
 		 resource.c signal.c sock.c system.c term.c time.c \
-		 proc.c scsi.c stream.c
+		 scsi.c stream.c block.c pathtrace.c mtd.c vsprintf.c \
+		 loop.c
 noinst_HEADERS = defs.h

 EXTRA_DIST = $(man_MANS) errnoent.sh signalent.sh syscallent.sh ioctlsort.c \
-	     debian/changelog debian/control debian/copyright debian/rules \
-	     debian/compat debian/strace64.install debian/strace64.manpages \
+	     debian/changelog debian/compat debian/control debian/copyright \
+	     debian/rules debian/source/format debian/watch \
+	     debian/strace64.install debian/strace64.manpages \
 	     debian/strace.docs debian/strace.examples debian/strace.install \
 	     debian/strace.manpages debian/strace-udeb.install \
 	     strace.spec \
-	     strace-graph ChangeLog ChangeLog-CVS COPYRIGHT CREDITS PORTING \
-	     README-freebsd README-linux README-sunos4 README-svr4 \
+	     strace-graph strace-log-merge \
+	     ChangeLog ChangeLog-CVS COPYRIGHT CREDITS \
+	     README-linux README-linux-ptrace \
 	     linux/ioctlsort.c linux/ioctlent.sh \
-	     linux/ioctlent.h linux/errnoent.h linux/signalent.h \
-	     linux/syscall.h linux/syscallent.h linux/dummy.h \
-	     linux/alpha/errnoent.h linux/alpha/ioctlent.h \
+	     linux/ioctlent.h.in linux/errnoent.h linux/signalent.h \
+	     linux/syscall.h linux/dummy.h linux/mtd-abi.h \
+	     linux/i386/ioctlent.h.in linux/i386/syscallent.h \
+	     linux/alpha/errnoent.h linux/alpha/ioctlent.h.in \
 	     linux/alpha/signalent.h linux/alpha/syscallent.h \
-	     linux/arm/syscallent.h linux/arm/syscallent1.h \
+	     linux/arm/ioctlent.h.in linux/arm/syscallent.h \
+	     linux/arm/syscallent1.h \
 	     linux/arm/signalent1.h linux/arm/ioctlent1.h \
 	     linux/arm/errnoent1.h \
-	     linux/avr32/syscallent.h \
-	     linux/bfin/ioctlent.h linux/bfin/syscallent.h \
-	     linux/hppa/errnoent.h linux/hppa/ioctlent.h \
+	     linux/avr32/ioctlent.h.in linux/avr32/syscallent.h \
+	     linux/bfin/ioctlent.h.in linux/bfin/syscallent.h \
+	     linux/hppa/errnoent.h linux/hppa/ioctlent.h.in \
 	     linux/hppa/signalent.h linux/hppa/syscallent.h \
+	     linux/ia64/ioctlent.h.in \
+	     linux/ia64/signalent.h \
 	     linux/ia64/syscallent.h \
-	     linux/ia64/ioctlent.h \
-	     linux/m68k/syscallent.h \
+	     linux/m68k/ioctlent.h.in linux/m68k/syscallent.h \
+	     linux/microblaze/ioctlent.h.in linux/microblaze/syscallent.h \
 	     linux/mips/ioctlent.sh linux/mips/errnoent.h \
-	     linux/mips/ioctlent.h linux/mips/signalent.h \
+	     linux/mips/ioctlent.h.in linux/mips/signalent.h \
 	     linux/mips/syscallent.h \
-	     linux/powerpc/syscallent.h \
-	     linux/powerpc/ioctlent.h \
-	     linux/s390/ioctlent.h \
+	     linux/powerpc/ioctlent.h.in linux/powerpc/ioctlent1.h \
+	     linux/powerpc/syscallent.h linux/powerpc/syscallent1.h \
+	     linux/powerpc/errnoent1.h linux/powerpc/signalent1.h \
+	     linux/s390/ioctlent.h.in \
 	     linux/s390/syscallent.h \
-	     linux/s390x/ioctlent.h \
+	     linux/s390x/ioctlent.h.in \
 	     linux/s390x/syscallent.h \
 	     linux/sh/syscallent.h \
-	     linux/sh/ioctlent.h \
-	     linux/sh64/syscallent.h \
+	     linux/sh/ioctlent.h.in \
+	     linux/sh64/ioctlent.h.in linux/sh64/syscallent.h \
 	     linux/sparc/dummy2.h \
 	     linux/sparc/errnoent.h linux/sparc/errnoent1.h \
-	     linux/sparc/ioctlent.h linux/sparc/ioctlent1.h \
+	     linux/sparc/ioctlent.h.in linux/sparc/ioctlent1.h \
 	     linux/sparc/signalent.h linux/sparc/signalent1.h \
-	     linux/sparc/syscall.h linux/sparc/syscall1.h \
+	     linux/sparc/syscall1.h \
 	     linux/sparc/syscallent.h linux/sparc/syscallent1.h \
-	     linux/sparc/gen.pl linux/sparc/syscall.h.2 \
+	     linux/sparc/gen.pl \
 	     linux/sparc64/dummy2.h linux/sparc64/errnoent.h \
 	     linux/sparc64/errnoent1.h linux/sparc64/errnoent2.h \
-	     linux/sparc64/ioctlent.h linux/sparc64/ioctlent1.h \
+	     linux/sparc64/ioctlent.h.in linux/sparc64/ioctlent1.h \
 	     linux/sparc64/ioctlent2.h linux/sparc64/signalent.h \
 	     linux/sparc64/signalent1.h linux/sparc64/signalent2.h \
-	     linux/sparc64/syscall.h linux/sparc64/syscall1.h \
+	     linux/sparc64/syscall1.h \
 	     linux/sparc64/syscallent.h linux/sparc64/syscallent1.h \
 	     linux/sparc64/syscallent2.h \
-	     linux/x86_64/syscallent.h linux/x86_64/gentab.pl \
+	     linux/tile/ioctlent.h.in linux/tile/syscallent.h \
+	     linux/x32/errnoent.h linux/x32/ioctlent.h.in \
+	     linux/x32/signalent.h linux/x32/syscallent.h \
+	     linux/x32/errnoent1.h linux/x32/ioctlent1.h \
+	     linux/x32/signalent1.h linux/x32/syscallent1.h \
+	     linux/x86_64/ioctlent.h.in linux/x86_64/syscallent.h \
+	     linux/x86_64/gentab.pl \
 	     linux/x86_64/errnoent1.h linux/x86_64/ioctlent1.h \
 	     linux/x86_64/signalent1.h linux/x86_64/syscallent1.h \
-	     freebsd/ioctlent.sh \
-	     freebsd/syscalls.cat freebsd/syscalls.pl freebsd/syscalls.print \
-	     freebsd/i386/errnoent.h freebsd/i386/ioctlent.h \
-	     freebsd/i386/signalent.h \
-	     freebsd/i386/syscall.h freebsd/i386/syscallent.h \
-	     sunos4/dummy.h sunos4/errnoent.h \
-	     sunos4/ioctlent.h sunos4/ioctlent.sh sunos4/signalent.h \
-	     sunos4/syscall.h sunos4/syscallent.h \
-	     svr4/dummy.h svr4/errnoent.h svr4/ioctlent.h svr4/ioctlent.sh \
-	     svr4/signalent.h svr4/syscall.h svr4/syscallent.h \
+	     linux/x86_64/errnoent2.h linux/x86_64/ioctlent2.h \
+	     linux/x86_64/signalent2.h linux/x86_64/syscallent2.h \
 	     xlate.el

 .PHONY: srpm
-srpm: dist-bzip2
-	rpmbuild --define '%_srcrpmdir .' -ts $(distdir).tar.bz2
+srpm: dist-xz
+	rpmbuild --define '%_srcrpmdir .' -ts $(distdir).tar.xz
+
+BUILT_SOURCES =

 if MAINTAINER_MODE

@ -94,28 +104,35 @@ $(srcdir)/ChangeLog: $(top_srcdir)/gitlog-to-changelog $(srcdir)/Makefile.in \
 		     $(top_srcdir)/.git/refs/heads/*
 	@rm -f $@.new
 	(cd $(top_srcdir); \
-	 ./gitlog-to-changelog --since='$(gen_changelog_start_date)'; \
+	 ./gitlog-to-changelog --append-dot \
+	   --since='$(gen_changelog_start_date)'; \
 	 echo; echo; echo 'See ChangeLog-CVS for older changes.' \
 	) > $@.new
 	chmod 444 $@.new
 	mv -f $@.new $@

-export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner --mode=go-w,go+rX
+$(srcdir)/CREDITS: $(top_srcdir)/CREDITS.in $(top_srcdir)/.mailmap \
+		   $(srcdir)/Makefile.in $(top_srcdir)/.git/refs/heads/*
+	$(AM_V_GEN)							\
+	{								\
+	  cd $(top_srcdir);						\
+	  sed '/^##/,$$d' CREDITS.in;					\
+	  { sed -n '1,/^##>/d; s/  \+/\t/; s/^./&/p' CREDITS.in;	\
+	    git log --pretty=format:'%aN	%aE';			\
+	  } | LC_ALL=C sort -u						\
+	    | awk -F'\t' '{printf("\t%s <%s>\n",$$1,$$2)}';		\
+	} > $@-t && mv $@-t $@

-if LINUX
+export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner --mode=go-w,go+rX

 IOCTLDIR = /usr/include
 IOCTLASM = asm

-if I386
-ioctlent_h = linux/ioctlent.h
-else
-ioctlent_h = linux/$(ARCH)/ioctlent.h
-endif
+ioctlent_h_in = linux/ioctlent.h.in

-BUILT_SOURCES = $(ioctlent_h)
+BUILT_SOURCES += $(ioctlent_h_in)

-$(srcdir)/$(ioctlent_h): ioctlsort
+$(srcdir)/$(ioctlent_h_in): ioctlsort
 	$(<D)/$(<F) > $@
 ioctlsort: $(srcdir)/linux/ioctlsort.c ioctls.h ioctldefs.h
 	$(filter-out -I%,$(LINK.c)) -I. -I$(IOCTLDIR) $(filter -I%,$(LINK.c)) \
@ -125,4 +142,13 @@ ioctls.h: $(srcdir)/linux/ioctlent.sh
 ioctldefs.h: ioctls.h ;

 endif
-endif
+
+ioctlent_h = $(builddir)/$(OS)/ioctlent.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 - | \
+		LC_ALL=C sort -u -k3,3 -k2,2 > $@
--- a/163
+++ b/163
@ -1,3 +1,165 @@
+Noteworthy changes in release 4.7
+=================================
+
+* Changes in behavior
+  * strace no longer suspends waitpid until there is a child
+    for waitpid'ing process to collect status from.
+  * strace no longer detaches from a tracee which is supposed
+    to be going to die.
+  * strace now issues a new message: "+++ exited with EXITCODE +++"
+    which shows exact moment strace got exit notification,
+    analogous to existing "+++ killed by SIG +++" message.
+
+* Improvements
+  * Added x32 personality support (x86_64 architecture).
+  * Added -y and -P options to print file descriptor paths and
+    filter by those paths.
+  * Added -I option to control strace interactivity.
+  * Allowed -p option to take comma or whitespace-separated list of PIDs.
+  * Added strace_log_merge script helper to merge timestamped "strace -ff"
+    log files.
+  * Implemented decoding of clock_adjtime, get_robust_list, migrate_pages,
+    preadv, prlimit64, process_vm_readv, process_vm_writev, pwritev,
+    recvmmsg, recvmsg, rt_tgsigqueueinfo, sendmmsg, setns, set_robust_list,
+    sched_rr_get_interval, splice, syslog, tee and vmsplice syscalls.
+  * Enhanced decoding of capget, capset, getrlimit, flistxattr, io_submit,
+    listxattr, setrlimit and swapon syscalls.
+  * Implemented decoding of loop and mtd ioctls.
+  * Added syscall entries for new linux syscalls.
+  * Added syscall entries for direct socket system calls on powerpc.
+  * Updated the list of errno constants.
+  * Updated lists of MSG_*, STA_*, and TCP_* constants.
+  * Regenerated the list of ioctl names from Linux 3.3.
+  * Enhanced switching between processes with different personalities.
+  * Enhanced signals reporting by using short signal names.
+  * Made ERESTART* messages more descriptive.
+  * Made parsing of numbers from strings more robust.
+  * Added support for compat_statfs64 and statfs64.f_flags.
+  * Changed read of data blocks to use single process_vm_readv syscall
+    (when available) instead of several PTRACE_PEEKDATA operations.
+  * Changed read of registers on x86 and x86-64 to use single PTRACE_GETREGS
+    operation instead of several PTRACE_PEEKUSER operations.
+  * Applied various optimizations to make strace work faster.
+
+* Bug fixes
+  * Implemented proper handling of real SIGTRAPs on kernels supporting
+    PTRACE_O_TRACESYSGOOD.
+    (Addresses Fedora bug #162774).
+  * Fixed sockaddr_un.sun_path name in decoded output.
+    (Addresses Debian bug #554946).
+  * Fixed to avoid potential core file clobbering on exit.
+    (Addresses Debian bug #656398).
+  * Fixed a typo in documentation.
+    (Addresses Debian bug #653309).
+  * Fixed decoding of timer id returned by timer_create.
+  * Fixed epoll_create1, epoll_wait and epoll_pwait decoding.
+  * Fixed *at syscalls flags decoding.
+  * Fixed ARM EABI 64-bit syscall's arguments decoding.
+  * Fixed semtimedop decoding on s390.
+  * Fixed osf_sigprocmask decoding on alpha.
+  * Fixed ipc and socket subcall decoding on several architectures.
+  * Corrected syscall entries for epoll_pwait, epoll_create, epoll_ctl,
+    epoll_wait, mincore, mlockall, prctl, reboot, sendfile, sendfile64,
+    sendmsg, sgetmask, ssetmask, swapon, tgkill and tkill syscalls.
+  * Corrected io_* syscall entries on ARM.
+  * Fixed PID prefix printing in "strace -oLOG -ff -p1 -p2 -p3" case.
+  * Fixed logging of unfinished lines in "strace -oLOG -ff" case.
+  * Fixed build when libaio-devel is not available.
+  * Fixed configure checks for PTRACE_* constants.
+  * Fixed compilation warnings remained on several architectures.
+
+* Portability
+  * Removed all non-Linux code.  After years of neglect, that dead code
+    just hampered further strace development.
+  * Linux kernel >= 2.6.18 is recommended.  Older versions might still
+    work but they haven't been thoroughly tested with this release.
+
+Noteworthy changes in release 4.6
+=================================
+
+* Changes in behavior
+  * Print diagnostic information about changes in personality mode to
+    standard error instead of standard output.
+
+* Improvements
+  * Implemented a new method of following clone, fork, and vfork
+    syscalls using the Linux kernel's explicit facilities for tracing
+    creation of threads and child processes.
+  * Implemented CLONE_PARENT and CLONE_UNTRACED flags handling.
+  * Implemented decoding of TLS syscalls on m68k.
+  * Implemented biarch support on powerpc64.
+  * Implemented biarch support for getrlimit() and setrlimit().
+  * Implemented decoding of struct ucred in getsockopt SO_PEERCRED.
+  * Implemented SOL_SCTP socket options decoding.
+  * Added HDIO_* ioctl names.
+    (Addresses Debian bug #450953).
+  * Added LOOP_* ioctl names.
+  * Updated lists of CLOCK_*, CLONE_*, MS_*, and SOL_* constants
+    to match Linux 2.6.37.
+  * Updated the list of IPPROTO_* constants to match netinet/in.h.
+  * Implemented decoding of HDIO_* and BLK* ioctls.
+  * Added MicroBlaze architecture support.
+  * Added new syscall entries to match Linux 2.6.37.
+  * Regenerated list of ioctl names from Linux 2.6.37.
+  * Enhanced signal notification decoding.
+  * Documented -C and -D options.
+
+* Bug fixes
+  * Fixed fetching syscall arguments on m68k.
+  * Fixed an error when judging whether a process has children.
+  * Fixed get/set_robust_list syscall numbers for powerpc.
+  * Fixed a corner case in printing clone flags.
+  * Fixed cross-compiling issues.
+  * Fixed build issues on powerpc64, SH and SPARC.
+  * Fixed syscall flags of fstatat*, mmap, mmap2, fadvise64*, swapoff,
+    fgetxattr, flistxattr, fremovexattr, epoll_create, fallocate,
+    fanotify_init, and fanotify_mark syscalls.
+  * Fixed decoding of get[ug]id, gete[ug]id and setfs[ug]id return values.
+  * Fixed biarch support in IO dumping.
+  * Fixed raw exit_group decoding.
+  * Fixed decoding of file descriptors on 64-bit architectures.
+  * Fixed a corner case in waitpid handling.
+    (Addresses Red Hat bug #663547).
+  * Fixed stat64 decoding on mips
+    (Addresses Debian bug #599028).
+  * Fixed misleading italics in the manual page.
+    (Addresses Debian bug #589323).
+
+Noteworthy changes in release 4.5.20
+====================================
+
+* Improvements
+  * Implemented decoding of new linux syscalls: inotify_init1, recvmmsg.
+  * Implemented basic decoding of new linux syscalls: preadv, pwritev,
+    rt_tgsigqueueinfo, perf_event_open.
+  * Enhanced decoding of recently added syscalls on non-x86 architectures
+    by replacing a bare decoder with elaborate parsers enabled earlier
+    for x86/x86-64.
+  * Implemented -C option to combine regular and -c output.
+    (Addresses Debian bug #466196)
+  * Enhanced decoding of mbind and mremap syscalls.
+  * Enhanced SOL_PACKET socket options decoding.
+  * Regenerated list of ioctl names from linux 2.6.33.
+  * Added TILE architecture support.
+
+* Bug fixes
+  * Fixed build with Linux kernel headers 2.6.32-rc5+.
+    (Addresses Debian bug #560516 and Fedora bug #539044)
+  * Fixed build on mips.
+  * Fixed handling of Linux systems without struct statfs64.
+  * Fixed reporting signal mask by sigreturn on powerpc.
+  * Fixed potential stack buffer overflow in select decoder.
+    (Addresses Fedora bug #556678)
+  * Corrected msgsnd indirect ipccall decoding.
+  * Corrected decoding of 64bit syscalls.
+    (Addresses Debian bug #570603)
+  * Corrected getsockopt decoding on architectures where
+    sizeof(long) > sizeof(int).
+    (Addresses Debian bug #494844)
+  * Corrected decoding of epoll_pwait.
+    (Addresses Debian bug #513014)
+  * Corrected handling of killed threads.
+
 Noteworthy changes in release 4.5.19
 ====================================

@ -38,6 +200,7 @@ Noteworthy changes in release 4.5.19
  * Marked sendfile(2) as a network syscall.
    (Addresses Debian bug #509499)
  * Fixed accept(2) decoding.
+    (Addresses Debian bug #507573)
  * Fixed sigtimedwait(2) decoding.
  * Fixed build on ARM EABI.
    (Addresses Debian bugs #520084 and #535564, and Fedora bug #507576)
--- a/70
+++ b/70
@ -1,70 +0,0 @@
-I am frequently asked to port strace to a given platform.  Less
-frequently I am asked how one would go about porting strace to a given
-platform. :-) Since I have ported strace to a few platforms already I
-have some advice to the would-be strace porter.
-
-The number one question is ``Does the native operating support a
-concept which enables even the mere possibility of tracing?''.  So far
-I have seen two mechanisms which support system call tracing.  They
-are the SunOS originated feature of the PTRACE_SYSCALL argument to the
-ptrace system call and the PIOCSENTRY/PIOCSEXIT ioctl for the /proc
-filesystem under System V release 4 style Unix derived systems.  There
-may be others (surely a better one could be devised :-) but innovation
-is a rare commodity so unless one of these is supported you may be
-SOL.
-
-Therefore the first step is to try `man 2 ptrace' and `man 4 proc' to
-see if there is even a glimmer of hope.  Without assistance from the
-operating system, system call tracing is a lost cause.  If there is a
-native system call tracing program (however pathetic it might be :-),
-you may be able to use it to trace itself to determine what mechanism
-it is using for tracing the system calls of another process.  If the
-interface is documented you should be a happy camper.  Otherwise,
-unless you can tolerate the thought of many thankless hours
-single-stepping in a debugger with little or nothing to show for it,
-you should consider other tasks to distract you from your friends,
-family, education, job, spouse and/or significant other.
-
-If you have arrived here, your OS should have ptrace or proc or you
-should have a high tolerance for pain.  Then again, curious but
-detached readers are invited to continue with little to risk but
-boredom.  If the mechanism is neither ptrace nor proc then examine how
-it is intended to work and see how well it fits with what strace
-already does.  If it fits, fine, add a few more ifdefs.  If there is a
-gross mismatch, write a whole new event loop.
-
-At this point you are responsible for determining three things: how is
-the specific system call communicated, how are system call arguments
-handled, and how is errno handled.  These things can usually be
-resolved in a day or two using a decent assembly level debugger and
-some educated guesswork.  For example, set a breakpoint on `read'.
-Then disassemble the code and see where the arguments go.  Do they go
-on the stack?  Do they go into registers?  Some combination of the
-two?  Find the point where the transition from user mode to kernel
-mode is made.  Can you identify the arguments at this point?  When the
-call returns where does errno go?  Into a specific register?  Into a
-global variable?
-
-Next you need to determine how to decode numeric system call numbers
-into system call names (syscallent.h), errno values into errno names
-(errnoent.h) and ioctl values into ioctl names (ioctlent.h).  Often
-this fragile step can be accomplished by massaging system header files
-with ad hoc shell scripts.  Expect your scripts to break with every
-dot rev of each OS release.
-
-Finally, once you have the basic framework in which system calls and
-their arguments can be decoded, you must do the dirty work of decoding
-every useful call.  Some may be similar or identical to like-named
-calls in other operating systems.  Go ahead and tweak what is there
-to achieve what you want.  If there is more difference than similarity,
-then just write your own version of it using one of the existing
-implementations for ideas.
-
-The first order of decoding is the generation of suitable system call,
-errno, ioctl and signal tables.  Sample scripts are included to assist
-with the generation of a first pass at these tables.
-
-Good luck and feel free to contact me before and/or during any major
-project.
-
-Rick Sladkey <jrs@world.std.com>
--- a/26
+++ b/26
@ -1,31 +1,17 @@
-This is strace 4.0, a system call tracer for SunOS 4.x, Linux, System
-V release 4, Solaris 2.x and Irix 5.x.  strace is released under a
-Berkeley-style license at the request of Paul Kranenburg; see the file
-COPYRIGHT for details.
+This is strace, a system call tracer for Linux.

-Read the INSTALL file for generic instructions on how to install
-strace.  If configure cannot guess your system configuration, you can
-specify it on the command line after the other options like this:
+strace is released under a Berkeley-style license at the request
+of Paul Kranenburg; see the file COPYRIGHT for details.

-	./configure --prefix=/usr i486-linux
+See the file CREDITS for a list of authors and other contributors.

-A single sunos4.1 binary should work on all the sun4, sun4c and sun4m
-kernel architectures.  Let me know if sun4d doesn't work.  Other
-i486-*-sysv4 systems may work with little or no tweaking.
+See the file INSTALL for compilation and installation instructions.

 See the file NEWS for information on what has changed in recent
 versions.

-See the file PORTING if you like strace but it doesn't work on an
-operating system you use frequently.
-
-See the file CREDITS to see who has contributed to strace.
-
-See the file TODO if you feel like helping out.
-
 You can get the latest version of strace from its homepage at
 http://sourceforge.net/projects/strace/ .

 Please send bug reports and enhancements to the strace
-mailinglist at strace-devel@lists.sourceforge.net, or directly to
-Wichert Akkerman <wakkerma@debian.org>
+mailinglist at strace-devel@lists.sourceforge.net.
--- a/26
+++ b/26
@ -1,26 +0,0 @@
-Here's a preliminary port of strace to FreeBSD.
-
-Here are some notes about it :
-
- This couldn't have been done without the sources of the truss
-  utility by Sean Eric Fagan, which were of great help.
-
- The tracing mecanism used by FreeBD is a lot like the SVR4 one, so
-  this port shares a lot of code with the SVR4 port, including the
-  akward event loop when tracing multiple processes.
-
- This works for i386 binaries, although support for alpha processor
-  should be quite straight forward, but I do not have an alpha to
-  test it on.
-
- Tracing linux binaries is not supported yet, but should be possible
-  with some work.
-
- There are some issues with following forks, and only a few FreeBSD
-  specific syscalls are decoded right now.
-
- This was tested on FreeBSD 4.0. I believe the tracing interface is
-  present since at least FreeBSD 3.0, so it "should" work on all
-  latest releases. I have no idea for other BSDs, though.
-
-Ga<EFBFBD>l Roualland <gael.roualland@iname.com>
--- a/542
+++ b/542
@ -0,0 +1,542 @@
+This document describes Linux ptrace implementation in Linux kernels
+version 3.0.0. (Update this notice if you update the document
+to reflect newer kernels).
+
+
+		Ptrace userspace API.
+
+Ptrace API (ab)uses standard Unix parent/child signaling over waitpid.
+An unfortunate effect of it is that resulting API is complex and has
+subtle quirks. This document aims to describe these quirks.
+
+Debugged processes (tracees) first need to be attached to the debugging
+process (tracer). Attachment and subsequent commands are per-thread: in
+multi-threaded process, every thread can be individually attached to a
+(potentially different) tracer, or left not attached and thus not
+debugged. Therefore, "tracee" always means "(one) thread", never "a
+(possibly multi-threaded) process". Ptrace commands are always sent to
+a specific tracee using ptrace(PTRACE_foo, pid, ...), where pid is a
+TID of the corresponding Linux thread.
+
+After attachment, each tracee can be in two states: running or stopped.
+
+There are many kinds of states when tracee is stopped, and in ptrace
+discussions they are often conflated. Therefore, it is important to use
+precise terms.
+
+In this document, any stopped state in which tracee is ready to accept
+ptrace commands from the tracer is called ptrace-stop. Ptrace-stops can
+be further subdivided into signal-delivery-stop, group-stop,
+syscall-stop and so on. They are described in detail later.
+
+
+	1.x Death under ptrace.
+
+When a (possibly multi-threaded) process receives a killing signal (a
+signal set to SIG_DFL and whose default action is to kill the process),
+all threads exit. Tracees report their death to the tracer(s). This is
+not a ptrace-stop (because tracer can't query tracee status such as
+register contents, cannot restart tracee etc) but the notification
+about this event is delivered through waitpid API similarly to
+ptrace-stop.
+
+Note that killing signal will first cause signal-delivery-stop (on one
+tracee only), and only after it is injected by tracer (or after it was
+dispatched to a thread which isn't traced), death from signal will
+happen on ALL tracees within multi-threaded process.
+
+SIGKILL operates similarly, with exceptions. No signal-delivery-stop is
+generated for SIGKILL and therefore tracer can't suppress it. SIGKILL
+kills even within syscalls (syscall-exit-stop is not generated prior to
+death by SIGKILL). The net effect is that SIGKILL always kills the
+process (all its threads), even if some threads of the process are
+ptraced.
+
+Tracer can kill a tracee with ptrace(PTRACE_KILL, pid, 0, 0). This
+operation is deprecated, use kill/tgkill(SIGKILL) instead.
+
+^^^ Oleg prefers to deprecate it instead of describing (and needing to
+support) PTRACE_KILL's quirks.
+
+When tracee executes exit syscall, it reports its death to its tracer.
+Other threads are not affected.
+
+When any thread executes exit_group syscall, every tracee in its thread
+group reports its death to its tracer.
+
+If PTRACE_O_TRACEEXIT option is on, PTRACE_EVENT_EXIT will happen
+before actual death. This applies to exits on exit syscall, group_exit
+syscall, signal deaths (except SIGKILL), and when threads are torn down
+on execve in multi-threaded process.
+
+Tracer cannot assume that ptrace-stopped tracee exists. There are many
+scenarios when tracee may die while stopped (such as SIGKILL).
+Therefore, tracer must always be prepared to handle ESRCH error on any
+ptrace operation. Unfortunately, the same error is returned if tracee
+exists but is not ptrace-stopped (for commands which require stopped
+tracee), or if it is not traced by process which issued ptrace call.
+Tracer needs to keep track of stopped/running state, and interpret
+ESRCH as "tracee died unexpectedly" only if it knows that tracee has
+been observed to enter ptrace-stop. Note that there is no guarantee
+that waitpid(WNOHANG) will reliably report tracee's death status if
+ptrace operation returned ESRCH. waitpid(WNOHANG) may return 0 instead.
+IOW: tracee may be "not yet fully dead" but already refusing ptrace ops.
+
+Tracer can not assume that tracee ALWAYS ends its life by reporting
+WIFEXITED(status) or WIFSIGNALED(status).
+
+??? or can it? Do we include such a promise into ptrace API?
+
+
+	1.x Stopped states.
+
+When running tracee enters ptrace-stop, it notifies its tracer using
+waitpid API. Tracer should use waitpid family of syscalls to wait for
+tracee to stop. Most of this document assumes that tracer waits with:
+
+	pid = waitpid(pid_or_minus_1, &status, __WALL);
+
+Ptrace-stopped tracees are reported as returns with pid > 0 and
+WIFSTOPPED(status) == true.
+
+??? Do we require __WALL usage, or will just using 0 be ok? Are the
+rules different if user wants to use waitid? Will waitid require
+WEXITED?
+
+__WALL value does not include WSTOPPED and WEXITED bits, but implies
+their functionality.
+
+Setting of WCONTINUED bit in waitpid flags is not recommended: the
+continued state is per-process and consuming it can confuse real parent
+of the tracee.
+
+Use of WNOHANG bit in waitpid flags may cause waitpid return 0 ("no
+wait results available yet") even if tracer knows there should be a
+notification. Example: kill(tracee, SIGKILL); waitpid(tracee, &status,
+__WALL | WNOHANG);
+
+??? waitid usage? WNOWAIT?
+
+??? describe how wait notifications queue (or not queue)
+
+The following kinds of ptrace-stops exist: signal-delivery-stops,
+group-stop, PTRACE_EVENT stops, syscall-stops [, SINGLESTEP, SYSEMU,
+SYSEMU_SINGLESTEP]. They all are reported as waitpid result with
+WIFSTOPPED(status) == true. They may be differentiated by checking
+(status >> 8) value, and if looking at (status >> 8) value doesn't
+resolve ambiguity, by querying PTRACE_GETSIGINFO. (Note:
+WSTOPSIG(status) macro returns ((status >> 8) & 0xff) value).
+
+
+	1.x.x Signal-delivery-stop
+
+When (possibly multi-threaded) process receives any signal except
+SIGKILL, kernel selects a thread which handles the signal (if signal is
+generated with t[g]kill, thread selection is done by user). If selected
+thread is traced, it enters signal-delivery-stop. By this point, signal
+is not yet delivered to the process, and can be suppressed by tracer.
+If tracer doesn't suppress the signal, it passes signal to tracee in
+the next ptrace request. This second step of signal delivery is called
+"signal injection" in this document. Note that if signal is blocked,
+signal-delivery-stop doesn't happen until signal is unblocked, with the
+usual exception that SIGSTOP can't be blocked.
+
+Signal-delivery-stop is observed by tracer as waitpid returning with
+WIFSTOPPED(status) == true, WSTOPSIG(status) == signal. If
+WSTOPSIG(status) == SIGTRAP, this may be a different kind of
+ptrace-stop - see "Syscall-stops" and "execve" sections below for
+details. If WSTOPSIG(status) == stopping signal, this may be a
+group-stop - see below.
+
+
+	1.x.x Signal injection and suppression.
+
+After signal-delivery-stop is observed by tracer, tracer should restart
+tracee with
+
+	ptrace(PTRACE_rest, pid, 0, sig)
+
+call, where PTRACE_rest is one of the restarting ptrace ops. If sig is
+0, then signal is not delivered. Otherwise, signal sig is delivered.
+This operation is called "signal injection" in this document, to
+distinguish it from signal-delivery-stop.
+
+Note that sig value may be different from WSTOPSIG(status) value -
+tracer can cause a different signal to be injected.
+
+Note that suppressed signal still causes syscalls to return
+prematurely. Kernel should always restart the syscall in this case:
+tracer would observe a new syscall-enter-stop for the same syscall,
+or, in case of syscalls returning ERESTART_RESTARTBLOCK,
+tracer would observe a syscall-enter-stop for restart_syscall(2)
+syscall. There may still be bugs in this area which cause some syscalls
+to instead return with -EINTR even though no observable signal
+was injected to the tracee.
+
+This is a cause of confusion among ptrace users. One typical scenario
+is that tracer observes group-stop, mistakes it for
+signal-delivery-stop, restarts tracee with ptrace(PTRACE_rest, pid, 0,
+stopsig) with the intention of injecting stopsig, but stopsig gets
+ignored and tracee continues to run.
+
+SIGCONT signal has a side effect of waking up (all threads of)
+group-stopped process. This side effect happens before
+signal-delivery-stop. Tracer can't suppress this side-effect (it can
+only suppress signal injection, which only causes SIGCONT handler to
+not be executed in the tracee, if such handler is installed). In fact,
+waking up from group-stop may be followed by signal-delivery-stop for
+signal(s) *other than* SIGCONT, if they were pending when SIGCONT was
+delivered. IOW: SIGCONT may be not the first signal observed by the
+tracee after it was sent.
+
+Stopping signals cause (all threads of) process to enter group-stop.
+This side effect happens after signal injection, and therefore can be
+suppressed by tracer.
+
+PTRACE_GETSIGINFO can be used to retrieve siginfo_t structure which
+corresponds to delivered signal. PTRACE_SETSIGINFO may be used to
+modify it. If PTRACE_SETSIGINFO has been used to alter siginfo_t,
+si_signo field and sig parameter in restarting command must match,
+otherwise the result is undefined.
+
+
+	1.x.x Group-stop
+
+When a (possibly multi-threaded) process receives a stopping signal,
+all threads stop. If some threads are traced, they enter a group-stop.
+Note that stopping signal will first cause signal-delivery-stop (on one
+tracee only), and only after it is injected by tracer (or after it was
+dispatched to a thread which isn't traced), group-stop will be
+initiated on ALL tracees within multi-threaded process. As usual, every
+tracee reports its group-stop separately to corresponding tracer.
+
+Group-stop is observed by tracer as waitpid returning with
+WIFSTOPPED(status) == true, WSTOPSIG(status) == signal. The same result
+is returned by some other classes of ptrace-stops, therefore the
+recommended practice is to perform
+
+	ptrace(PTRACE_GETSIGINFO, pid, 0, &siginfo)
+
+call. The call can be avoided if signal number is not SIGSTOP, SIGTSTP,
+SIGTTIN or SIGTTOU - only these four signals are stopping signals. If
+tracer sees something else, it can't be group-stop. Otherwise, tracer
+needs to call PTRACE_GETSIGINFO. If PTRACE_GETSIGINFO fails with
+EINVAL, then it is definitely a group-stop. (Other failure codes are
+possible, such as ESRCH "no such process" if SIGKILL killed the tracee).
+
+As of kernel 2.6.38, after tracer sees tracee ptrace-stop and until it
+restarts or kills it, tracee will not run, and will not send
+notifications (except SIGKILL death) to tracer, even if tracer enters
+into another waitpid call.
+
+Currently, it causes a problem with transparent handling of stopping
+signals: if tracer restarts tracee after group-stop, SIGSTOP is
+effectively ignored: tracee doesn't remain stopped, it runs. If tracer
+doesn't restart tracee before entering into next waitpid, future
+SIGCONT will not be reported to the tracer. Which would make SIGCONT to
+have no effect.
+
+
+	1.x.x PTRACE_EVENT stops
+
+If tracer sets TRACE_O_TRACEfoo options, tracee will enter ptrace-stops
+called PTRACE_EVENT stops.
+
+PTRACE_EVENT stops are observed by tracer as waitpid returning with
+WIFSTOPPED(status) == true, WSTOPSIG(status) == SIGTRAP. Additional bit
+is set in a higher byte of status word: value ((status >> 8) & 0xffff)
+will be (SIGTRAP | PTRACE_EVENT_foo << 8). The following events exist:
+
+PTRACE_EVENT_VFORK - stop before return from vfork/clone+CLONE_VFORK.
+When tracee is continued after this, it will wait for child to
+exit/exec before continuing its execution (IOW: usual behavior on
+vfork).
+
+PTRACE_EVENT_FORK - stop before return from fork/clone+SIGCHLD
+
+PTRACE_EVENT_CLONE - stop before return from clone
+
+PTRACE_EVENT_VFORK_DONE - stop before return from
+vfork/clone+CLONE_VFORK, but after vfork child unblocked this tracee by
+exiting or exec'ing.
+
+For all four stops described above: stop occurs in parent, not in newly
+created thread. PTRACE_GETEVENTMSG can be used to retrieve new thread's
+tid.
+
+PTRACE_EVENT_EXEC - stop before return from exec.
+
+PTRACE_EVENT_EXIT - stop before exit (including death from exit_group),
+signal death, or exit caused by execve in multi-threaded process.
+PTRACE_GETEVENTMSG returns exit status. Registers can be examined
+(unlike when "real" exit happens). The tracee is still alive, it needs
+to be PTRACE_CONTed or PTRACE_DETACHed to finish exit.
+
+PTRACE_GETSIGINFO on PTRACE_EVENT stops returns si_signo = SIGTRAP,
+si_code = (event << 8) | SIGTRAP.
+
+
+	1.x.x Syscall-stops
+
+If tracee was restarted by PTRACE_SYSCALL, tracee enters
+syscall-enter-stop just prior to entering any syscall. If tracer
+restarts it with PTRACE_SYSCALL, tracee enters syscall-exit-stop when
+syscall is finished, or if it is interrupted by a signal. (That is,
+signal-delivery-stop never happens between syscall-enter-stop and
+syscall-exit-stop, it happens *after* syscall-exit-stop).
+
+Other possibilities are that tracee may stop in a PTRACE_EVENT stop,
+exit (if it entered exit or exit_group syscall), be killed by SIGKILL,
+or die silently (if execve syscall happened in another thread).
+
+Syscall-enter-stop and syscall-exit-stop are observed by tracer as
+waitpid returning with WIFSTOPPED(status) == true, WSTOPSIG(status) ==
+SIGTRAP. If PTRACE_O_TRACESYSGOOD option was set by tracer, then
+WSTOPSIG(status) == (SIGTRAP | 0x80).
+
+Syscall-stops can be distinguished from signal-delivery-stop with
+SIGTRAP by querying PTRACE_GETSIGINFO: si_code <= 0 if sent by usual
+suspects like [tg]kill/sigqueue/etc; or = SI_KERNEL (0x80) if sent by
+kernel, whereas syscall-stops have si_code = SIGTRAP or (SIGTRAP |
+0x80). However, syscall-stops happen very often (twice per syscall),
+and performing PTRACE_GETSIGINFO for every syscall-stop may be somewhat
+expensive.
+
+Some architectures allow to distinguish them by examining registers.
+For example, on x86 rax = -ENOSYS in syscall-enter-stop. Since SIGTRAP
+(like any other signal) always happens *after* syscall-exit-stop, and
+at this point rax almost never contains -ENOSYS, SIGTRAP looks like
+"syscall-stop which is not syscall-enter-stop", IOW: it looks like a
+"stray syscall-exit-stop" and can be detected this way. But such
+detection is fragile and is best avoided.
+
+Using PTRACE_O_TRACESYSGOOD option is a recommended method, since it is
+reliable and does not incur performance penalty.
+
+Syscall-enter-stop and syscall-exit-stop are indistinguishable from
+each other by tracer. Tracer needs to keep track of the sequence of
+ptrace-stops in order to not misinterpret syscall-enter-stop as
+syscall-exit-stop or vice versa. The rule is that syscall-enter-stop is
+always followed by syscall-exit-stop, PTRACE_EVENT stop or tracee's
+death - no other kinds of ptrace-stop can occur in between.
+
+If after syscall-enter-stop tracer uses restarting command other than
+PTRACE_SYSCALL, syscall-exit-stop is not generated.
+
+PTRACE_GETSIGINFO on syscall-stops returns si_signo = SIGTRAP, si_code
+= SIGTRAP or (SIGTRAP | 0x80).
+
+
+	1.x.x SINGLESTEP, SYSEMU, SYSEMU_SINGLESTEP
+
+??? document PTRACE_SINGLESTEP, PTRACE_SYSEMU, PTRACE_SYSEMU_SINGLESTEP
+
+
+	1.x Informational and restarting ptrace commands.
+
+Most ptrace commands (all except ATTACH, TRACEME, KILL) require tracee
+to be in ptrace-stop, otherwise they fail with ESRCH.
+
+When tracee is in ptrace-stop, tracer can read and write data to tracee
+using informational commands. They leave tracee in ptrace-stopped state:
+
+longv = ptrace(PTRACE_PEEKTEXT/PEEKDATA/PEEKUSER, pid, addr, 0);
+	ptrace(PTRACE_POKETEXT/POKEDATA/POKEUSER, pid, addr, long_val);
+	ptrace(PTRACE_GETREGS/GETFPREGS, pid, 0, &struct);
+	ptrace(PTRACE_SETREGS/SETFPREGS, pid, 0, &struct);
+	ptrace(PTRACE_GETSIGINFO, pid, 0, &siginfo);
+	ptrace(PTRACE_SETSIGINFO, pid, 0, &siginfo);
+	ptrace(PTRACE_GETEVENTMSG, pid, 0, &long_var);
+	ptrace(PTRACE_SETOPTIONS, pid, 0, PTRACE_O_flags);
+
+Note that some errors are not reported. For example, setting siginfo
+may have no effect in some ptrace-stops, yet the call may succeed
+(return 0 and don't set errno).
+
+ptrace(PTRACE_SETOPTIONS, pid, 0, PTRACE_O_flags) affects one tracee.
+Current flags are replaced. Flags are inherited by new tracees created
+and "auto-attached" via active PTRACE_O_TRACE[V]FORK or
+PTRACE_O_TRACECLONE options.
+
+Another group of commands makes ptrace-stopped tracee run. They have
+the form:
+
+	ptrace(PTRACE_cmd, pid, 0, sig);
+
+where cmd is CONT, DETACH, SYSCALL, SINGLESTEP, SYSEMU, or
+SYSEMU_SINGLESTEP. If tracee is in signal-delivery-stop, sig is the
+signal to be injected. Otherwise, sig may be ignored.
+
+
+	1.x Attaching and detaching
+
+A thread can be attached to tracer using ptrace(PTRACE_ATTACH, pid, 0,
+0) call. This also sends SIGSTOP to this thread. If tracer wants this
+SIGSTOP to have no effect, it needs to suppress it. Note that if other
+signals are concurrently sent to this thread during attach, tracer may
+see tracee enter signal-delivery-stop with other signal(s) first! The
+usual practice is to reinject these signals until SIGSTOP is seen, then
+suppress SIGSTOP injection. The design bug here is that attach and
+concurrent SIGSTOP are racing and SIGSTOP may be lost.
+
+??? Describe how to attach to a thread which is already group-stopped.
+
+Since attaching sends SIGSTOP and tracer usually suppresses it, this
+may cause stray EINTR return from the currently executing syscall in
+the tracee, as described in "signal injection and suppression" section.
+
+ptrace(PTRACE_TRACEME, 0, 0, 0) request turns current thread into a
+tracee. It continues to run (doesn't enter ptrace-stop). A common
+practice is to follow ptrace(PTRACE_TRACEME) with raise(SIGSTOP) and
+allow parent (which is our tracer now) to observe our
+signal-delivery-stop.
+
+If PTRACE_O_TRACE[V]FORK or PTRACE_O_TRACECLONE options are in effect,
+then children created by (vfork or clone(CLONE_VFORK)), (fork or
+clone(SIGCHLD)) and (other kinds of clone) respectively are
+automatically attached to the same tracer which traced their parent.
+SIGSTOP is delivered to them, causing them to enter
+signal-delivery-stop after they exit syscall which created them.
+
+Detaching of tracee is performed by ptrace(PTRACE_DETACH, pid, 0, sig).
+PTRACE_DETACH is a restarting operation, therefore it requires tracee
+to be in ptrace-stop. If tracee is in signal-delivery-stop, signal can
+be injected. Othervice, sig parameter may be silently ignored.
+
+If tracee is running when tracer wants to detach it, the usual solution
+is to send SIGSTOP (using tgkill, to make sure it goes to the correct
+thread), wait for tracee to stop in signal-delivery-stop for SIGSTOP
+and then detach it (suppressing SIGSTOP injection). Design bug is that
+this can race with concurrent SIGSTOPs. Another complication is that
+tracee may enter other ptrace-stops and needs to be restarted and
+waited for again, until SIGSTOP is seen. Yet another complication is to
+be sure that tracee is not already ptrace-stopped, because no signal
+delivery happens while it is - not even SIGSTOP.
+
+??? Describe how to detach from a group-stopped tracee so that it
+    doesn't run, but continues to wait for SIGCONT.
+
+If tracer dies, all tracees are automatically detached and restarted,
+unless they were in group-stop. Handling of restart from group-stop is
+currently buggy, but "as planned" behavior is to leave tracee stopped
+and waiting for SIGCONT. If tracee is restarted from
+signal-delivery-stop, pending signal is injected.
+
+
+	1.x execve under ptrace.
+
+During execve, kernel destroys all other threads in the process, and
+resets execve'ing thread tid to tgid (process id). This looks very
+confusing to tracers:
+
+All other threads stop in PTRACE_EXIT stop, if requested by active
+ptrace option. Then all other threads except thread group leader report
+death as if they exited via exit syscall with exit code 0. Then
+PTRACE_EVENT_EXEC stop happens, if requested by active ptrace option
+(on which tracee - leader? execve-ing one?).
+
+The execve-ing tracee changes its pid while it is in execve syscall.
+(Remember, under ptrace 'pid' returned from waitpid, or fed into ptrace
+calls, is tracee's tid). That is, pid is reset to process id, which
+coincides with thread group leader tid.
+
+If thread group leader has reported its death by this time, for tracer
+this looks like dead thread leader "reappears from nowhere". If thread
+group leader was still alive, for tracer this may look as if thread
+group leader returns from a different syscall than it entered, or even
+"returned from syscall even though it was not in any syscall". If
+thread group leader was not traced (or was traced by a different
+tracer), during execve it will appear as if it has become a tracee of
+the tracer of execve'ing tracee. All these effects are the artifacts of
+pid change.
+
+PTRACE_O_TRACEEXEC option is the recommended tool for dealing with this
+case. It enables PTRACE_EVENT_EXEC stop which occurs before execve
+syscall return.
+
+Pid change happens before PTRACE_EVENT_EXEC stop, not after.
+
+When tracer receives PTRACE_EVENT_EXEC stop notification, it is
+guaranteed that except this tracee and thread group leader, no other
+threads from the process are alive.
+
+On receiving this notification, tracer should clean up all its internal
+data structures about all threads of this process, and retain only one
+data structure, one which describes single still running tracee, with
+pid = tgid = process id.
+
+Currently, there is no way to retrieve former pid of execve-ing tracee.
+If tracer doesn't keep track of its tracees' thread group relations, it
+may be unable to know which tracee  execve-ed and therefore no longer
+exists under old pid due to pid change.
+
+Example: two threads execve at the same time:
+
+  ** we get syscall-entry-stop in thread 1: **
+ PID1 execve("/bin/foo", "foo" <unfinished ...>
+  ** we issue PTRACE_SYSCALL for thread 1 **
+  ** we get syscall-entry-stop in thread 2: **
+ PID2 execve("/bin/bar", "bar" <unfinished ...>
+  ** we issue PTRACE_SYSCALL for thread 2 **
+  ** we get PTRACE_EVENT_EXEC for PID0, we issue PTRACE_SYSCALL **
+  ** we get syscall-exit-stop for PID0: **
+ PID0 <... execve resumed> )             = 0
+
+In this situation there is no way to know which execve succeeded.
+
+If PTRACE_O_TRACEEXEC option is NOT in effect for the execve'ing
+tracee, kernel delivers an extra SIGTRAP to tracee after execve syscall
+returns. This is an ordinary signal (similar to one which can be
+generated by "kill -TRAP"), not a special kind of ptrace-stop.
+GETSIGINFO on it has si_code = 0 (SI_USER). It can be blocked by signal
+mask, and thus can happen (much) later.
+
+Usually, tracer (for example, strace) would not want to show this extra
+post-execve SIGTRAP signal to the user, and would suppress its delivery
+to the tracee (if SIGTRAP is set to SIG_DFL, it is a killing signal).
+However, determining *which* SIGTRAP to suppress is not easy. Setting
+PTRACE_O_TRACEEXEC option and thus suppressing this extra SIGTRAP is
+the recommended approach.
+
+
+	1.x Real parent
+
+Ptrace API (ab)uses standard Unix parent/child signaling over waitpid.
+This used to cause real parent of the process to stop receiving several
+kinds of waitpid notifications when child process is traced by some
+other process.
+
+Many of these bugs have been fixed, but as of 2.6.38 several still
+exist.
+
+As of 2.6.38, the following is believed to work correctly:
+
+- exit/death by signal is reported first to tracer, then, when tracer
+consumes waitpid result, to real parent (to real parent only when the
+whole multi-threaded process exits). If they are the same process, the
+report is sent only once.
+
+
+	1.x Known bugs
+
+Following bugs still exist:
+
+Group-stop notifications are sent to tracer, but not to real parent.
+Last confirmed on 2.6.38.6.
+
+If thread group leader is traced and exits by calling exit syscall,
+PTRACE_EVENT_EXIT stop will happen for it (if requested), but subsequent
+WIFEXITED notification will not be delivered until all other threads
+exit. As explained above, if one of other threads execve's, thread
+group leader death will *never* be reported. If execve-ed thread is not
+traced by this tracer, tracer will never know that execve happened.
+
+??? need to test this scenario
+
+One possible workaround is to detach thread group leader instead of
+restarting it in this case. Last confirmed on 2.6.38.6.
+
+SIGKILL signal may still cause PTRACE_EVENT_EXIT stop before actual
+signal death. This may be changed in the future - SIGKILL is meant to
+always immediately kill tasks even under ptrace. Last confirmed on
+2.6.38.6.
--- a/85
+++ b/85
@ -1,85 +0,0 @@
-========================================================================
-This is the unmodified README from Paul Kranenburg's release of strace
-for SunOS 4.1.x.  Some of the notes and instructions are no longer valid
-however the file has been retained for its historical value. -- jrs
-========================================================================
-
-/*
- * @(#)README	2.4 92/01/21
- *
- * Copyright (C) 1991 Paul Kranenburg.
- *
- * Please send comments, enhancements or any other useful ideas to
- * the address at the end of this file.
- *
- */
-
-strace(1) is a system call tracer for Sun(tm) systems much like the
-Sun supplied program trace(1). strace(1) is a useful utility to sort
-of debug programs for which no source is available which unfortunately
-includes almost all of the Sun supplied system software.
-
-Like trace(1), strace displays each system call and its arguments as it
-is invoked by the traced process, but tries to do a better job of
-decoding the arguments, displaying them in symbolic format whenever
-possible. Passed structures/character arrays are read from the process'
-address space and displayed in an appropriate format.
-
-It is also possible to instruct strace to trace child processes as
-they are created by the fork(2) system call. However, this is slightly
-involved for two reasons: 1) the trace flag is cleared in the child
-process by the fork system call, so we must make a special effort to
-gain control of the child (see NOTES below), 2) our tracing manipulations
-of the child may interfere with a possible wait(2) system call executed
-by the (also traced) parent process. In this case we don't allow the parent
-to continue until one of its children enters a state that may cause the
-parent's wait(2) call to return.
-
-
-NOTES.
-
-o	Not all system calls have been implemented yet as described
-	above (see dummy.h for a list), these calls only have their args
-	displayed as hex numbers.
-
-o	The program draws heavily on Sun's extensions to the ptrace(2)
-	system call.
-
-o	This release is based upon SunOS 4.1.1. The syscall list (syscall.h)
-	and ioctl's (ioctlent.m4) are probably most critically dependant
-	on the OS version (see also /sys/os/init_sysent.c).
-	You may have to edit `ioctlsort.c' and/or `ioctlent.m4' to get
-	`ioctlsort.c' to compile with your suite of system header files.
-
-o	The way in which child processes are caught and attached to after
-	the fork() call is Sparc-specific (in fact it has the looks of a
-	terrible hack). Also, this trick won't work with vfork(2).
-	Enhancements are sollicited for.
-
-o	Dynamically linked executables can be convinced to use the fork(2)
-	system call in stead of vfork(2) by modifying their (internal)
-	symbol table immediately after such a program is exec'ed. Be
-	warned that programs which depend on vfork's peculiar semantics
-	may not run as expected. Enable by the `-F' switch.
-
-
-INSTALLATION.
-
-	Edit the paths in the Makefile to suit your local system.
-	Enter the usual make commands (`make debug' to enable the
-	compiler `-g' flag).
-
-	Not all sites have a complete set of include files, depending
-	on the selected software categories at OS install time. The
-	makefile tries to detect the presence of the Sunview category,
-	if other files are missing you may have to edit `ioctlent.h'.
-
-
-COMMENTS TO:
-
-	P. Kranenburg
-	Department of Computer Science
-	Erasmus University Rotterdam
-	P.O. Box 1738
-	NL-3000 DR Rotterdam
-	e-mail: pk@cs.few.eur.nl
--- a/21
+++ b/21
@ -1,21 +0,0 @@
-Even though SVR4 has truss, you may prefer using strace for a number
-of reasons.  Not the least of which are portability and source code.
-
-The main event loop is awkward on systems for which procfs isn't
-pollable.  I think a pollable procfs is a Solaris invention so most SVR4
-systems have this weakness.  On Solaris, strace runs as a single
-controlling process.  This is a big improvement if you are debugging a
-lot of processes at once.
-
-There is no thread support but it wouldn't be very difficult to add it.
-
-On UnixWare using the -f option to follow forked children sometimes shows
-many "unfinished" system calls as strace bounces between each runnable child.
-A crude workaround for this is available by adding
-
-    #define POLL_HACK 1
-
-to the config.h file.  This forces strace to check whether the last process
-has finished a system call before polling other processes for events.
-
-Wichert Akkerman <wakkerma@debian.org>
--- a/32
+++ b/32
@ -1,32 +0,0 @@
-- new entries from wta
-* clone doesn't work; cloned processes can hang
-* partially done: finish up change_syscall using new setargs
-* do setargs for non-ia64
-* generate syscallent.h from the kernel sources (asm/unistd.h)
-* update linux/sparc syscall entries; Linux messed things up by overriding
-  all kinds of SunOS entries
-* synchronize linux/**/syscallent.h, number of arguments for a syscal isn't
-  consistent across different architectures
-
-- old entries from jrs
-attempt reopen of /proc file if we get EAGAIN from any /proc ioctl
-kill procs we error out of on svr4
-enclose "total x dents" in a comment
-declare gettimeofday and pread for solaris2
-update automatic remaking of autoconf targets
-I don't like run on last close, change it?
-parse long options?
-count signals too with -c
-treat attach, detach messages like signals
-add pread, pwrite to I/O dumping
-add system assist for qualifiers on svr4
-change printcall to getcaller and fix for linux and svr4
-fix fork hang for svr4 without pollable procfs
-print events on entry to and revents on exit from poll
-monitor procfs open and release the other child if the process wants to own it
-fix incorrect syscall number if exit without entry on svr4 without pr_syscall
-fix clean targets so config.h and config.status can be removed
-ignore faults which occur before exec
-look for more ioctls on solaris, used in nslookup for example
-consider adding backtrace support
-consider adding general purpose interpreter
--- a/acinclude.m4
+++ b/acinclude.m4
@ -1,281 +0,0 @@
-dnl
-dnl This file contains macros used in configure.ac.
-dnl automake uses this file to generate aclocal.m4, which is used by autoconf.
-dnl
-
-dnl ### A macro to find the include directory, useful for cross-compiling.
-AC_DEFUN([AC_INCLUDEDIR],
-[AC_REQUIRE([AC_PROG_AWK])dnl
-AC_SUBST(includedir)
-AC_MSG_CHECKING(for primary include directory)
-includedir=/usr/include
-if test -n "$GCC"
-then
-	>conftest.c
-	new_includedir=`
-		$CC -v -E conftest.c 2>&1 | $AWK '
-			/^End of search list/ { print last; exit }
-			{ last = [$]1 }
-		'
-	`
-	rm -f conftest.c
-	if test -n "$new_includedir" && test -d "$new_includedir"
-	then
-		includedir=$new_includedir
-	fi
-fi
-AC_MSG_RESULT($includedir)
-])
-
-dnl ### A macro to set gcc warning flags.
-define(AC_WARNFLAGS,
-[AC_SUBST(WARNFLAGS)
-if test -z "$WARNFLAGS"
-then
-	if test -n "$GCC"
-	then
-		# If we're using gcc we want warning flags.
-		WARNFLAGS=-Wall
-	fi
-fi
-])
-
-dnl ### A macro to determine if we have a "MP" type procfs
-AC_DEFUN([AC_MP_PROCFS],
-[AC_MSG_CHECKING(for MP procfs)
-AC_CACHE_VAL(ac_cv_mp_procfs,
-[AC_RUN_IFELSE([AC_LANG_SOURCE([[
-#include <stdio.h>
-#include <signal.h>
-#include <sys/procfs.h>
-
-main()
-{
-	int pid;
-	char proc[32];
-	FILE *ctl;
-	FILE *status;
-	int cmd;
-	struct pstatus pstatus;
-
-	if ((pid = fork()) == 0) {
-		pause();
-		exit(0);
-	}
-	sprintf(proc, "/proc/%d/ctl", pid);
-	if ((ctl = fopen(proc, "w")) == NULL)
-		goto fail;
-	sprintf(proc, "/proc/%d/status", pid);
-	if ((status = fopen (proc, "r")) == NULL)
-		goto fail;
-	cmd = PCSTOP;
-	if (write (fileno (ctl), &cmd, sizeof cmd) < 0)
-		goto fail;
-	if (read (fileno (status), &pstatus, sizeof pstatus) < 0)
-		goto fail;
-	kill(pid, SIGKILL);
-	exit(0);
-fail:
-	kill(pid, SIGKILL);
-	exit(1);
-}
-]])],[ac_cv_mp_procfs=yes],[ac_cv_mp_procfs=no],[
-# Guess or punt.
-case "$host_os" in
-svr4.2*|svr5*)
-	ac_cv_mp_procfs=yes
-	;;
-*)
-	ac_cv_mp_procfs=no
-	;;
-esac
-])])
-AC_MSG_RESULT($ac_cv_mp_procfs)
-if test "$ac_cv_mp_procfs" = yes
-then
-	AC_DEFINE([HAVE_MP_PROCFS], 1,
-[Define if you have a SVR4 MP type procfs.
-I.E. /dev/xxx/ctl, /dev/xxx/status.
-Also implies that you have the pr_lwp member in prstatus.])
-fi
-])
-
-dnl ### A macro to determine if procfs is pollable.
-AC_DEFUN([AC_POLLABLE_PROCFS],
-[AC_MSG_CHECKING(for pollable procfs)
-AC_CACHE_VAL(ac_cv_pollable_procfs,
-[AC_RUN_IFELSE([AC_LANG_SOURCE([[
-#include <stdio.h>
-#include <signal.h>
-#include <sys/procfs.h>
-#include <sys/stropts.h>
-#include <poll.h>
-
-#ifdef HAVE_MP_PROCFS
-#define PIOCSTOP	PCSTOP
-#define POLLWANT	POLLWRNORM
-#define PROC		"/proc/%d/ctl"
-#define PROC_MODE	"w"
-int IOCTL (int fd, int cmd, int arg) {
-	return write (fd, &cmd, sizeof cmd);
-}
-#else
-#define POLLWANT	POLLPRI
-#define	PROC		"/proc/%d"
-#define PROC_MODE	"r+"
-#define IOCTL		ioctl
-#endif
-
-main()
-{
-	int pid;
-	char proc[32];
-	FILE *pfp;
-	struct pollfd pfd;
-
-	if ((pid = fork()) == 0) {
-		pause();
-		exit(0);
-	}
-	sprintf(proc, PROC, pid);
-	if ((pfp = fopen(proc, PROC_MODE)) == NULL)
-		goto fail;
-	if (IOCTL(fileno(pfp), PIOCSTOP, NULL) < 0)
-		goto fail;
-	pfd.fd = fileno(pfp);
-	pfd.events = POLLWANT;
-	if (poll(&pfd, 1, 0) < 0)
-		goto fail;
-	if (!(pfd.revents & POLLWANT))
-		goto fail;
-	kill(pid, SIGKILL);
-	exit(0);
-fail:
-	kill(pid, SIGKILL);
-	exit(1);
-}
-]])],[ac_cv_pollable_procfs=yes],[ac_cv_pollable_procfs=no],[
-# Guess or punt.
-case "$host_os" in
-solaris2*|irix5*|svr4.2uw*|svr5*)
-	ac_cv_pollable_procfs=yes
-	;;
-*)
-	ac_cv_pollable_procfs=no
-	;;
-esac
-])])
-AC_MSG_RESULT($ac_cv_pollable_procfs)
-if test "$ac_cv_pollable_procfs" = yes
-then
-	AC_DEFINE([HAVE_POLLABLE_PROCFS], 1,
-[Define if you have SVR4 and the poll system call works on /proc files.])
-fi
-])
-
-dnl ### A macro to determine if the prstatus structure has a pr_syscall member.
-AC_DEFUN([AC_STRUCT_PR_SYSCALL],
-[AC_MSG_CHECKING(for pr_syscall in struct prstatus)
-AC_CACHE_VAL(ac_cv_struct_pr_syscall,
-[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/procfs.h>]], [[#ifdef HAVE_MP_PROCFS
-pstatus_t s;
-s.pr_lwp.pr_syscall
-#else
-prstatus_t s;
-s.pr_syscall
-#endif]])],[ac_cv_struct_pr_syscall=yes],[ac_cv_struct_pr_syscall=no])])
-AC_MSG_RESULT($ac_cv_struct_pr_syscall)
-if test "$ac_cv_struct_pr_syscall" = yes
-then
-	AC_DEFINE([HAVE_PR_SYSCALL], 1,
-[Define if the prstatus structure in sys/procfs.h has a pr_syscall member.])
-fi
-])
-
-dnl ### A macro to determine whether stat64 is defined.
-AC_DEFUN([AC_STAT64],
-[AC_MSG_CHECKING(for stat64 in (asm|sys)/stat.h)
-AC_CACHE_VAL(ac_cv_type_stat64,
-[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifdef LINUX
-#include <linux/types.h>
-#include <asm/stat.h>
-#else
-#include <sys/stat.h>
-#endif]], [[struct stat64 st;]])],[ac_cv_type_stat64=yes],[ac_cv_type_stat64=no])])
-AC_MSG_RESULT($ac_cv_type_stat64)
-if test "$ac_cv_type_stat64" = yes
-then
-	AC_DEFINE([HAVE_STAT64], 1,
-[Define if stat64 is available in asm/stat.h.])
-fi
-])
-
-dnl ### A macro to determine if off_t is a long long
-AC_DEFUN([AC_OFF_T_IS_LONG_LONG],
-[AC_MSG_CHECKING(for long long off_t)
-AC_CACHE_VAL(ac_cv_have_long_long_off_t,
-[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <sys/types.h>
-main () {
-	if (sizeof (off_t) == sizeof (long long) &&
-	    sizeof (off_t) > sizeof (long))
-	    return 0;
-	return 1;
-}
-]])],[ac_cv_have_long_long_off_t=yes],[ac_cv_have_long_long_off_t=no],[# Should try to guess here
-ac_cv_have_long_long_off_t=no
-])])
-AC_MSG_RESULT($ac_cv_have_long_long_off_t)
-if test "$ac_cv_have_long_long_off_t" = yes
-then
-	AC_DEFINE([HAVE_LONG_LONG_OFF_T], 1, [Define if off_t is a long long.])
-fi
-])
-
-dnl ### A macro to determine if rlim_t is a long long
-AC_DEFUN([AC_RLIM_T_IS_LONG_LONG],
-[AC_MSG_CHECKING(for long long rlim_t)
-AC_CACHE_VAL(ac_cv_have_long_long_rlim_t,
-[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-main () {
-	if (sizeof (rlim_t) == sizeof (long long) &&
-	    sizeof (rlim_t) > sizeof (long))
-	    return 0;
-	return 1;
-}
-]])],[ac_cv_have_long_long_rlim_t=yes],[ac_cv_have_long_long_rlim_t=no],[# Should try to guess here
-ac_cv_have_long_long_rlim_t=no
-])])
-AC_MSG_RESULT($ac_cv_have_long_long_rlim_t)
-if test "$ac_cv_have_long_long_rlim_t" = yes
-then
-	AC_DEFINE([HAVE_LONG_LONG_RLIM_T], 1, [Define if rlim_t is a long long.])
-fi
-])
-
-dnl ### A macro to determine endianness of long long
-AC_DEFUN([AC_LITTLE_ENDIAN_LONG_LONG],
-[AC_MSG_CHECKING(for little endian long long)
-AC_CACHE_VAL(ac_cv_have_little_endian_long_long,
-[AC_RUN_IFELSE([AC_LANG_SOURCE([[
-int main () {
-	union {
-		long long ll;
-		long l [2];
-	} u;
-	u.ll = 0x12345678;
-	if (u.l[0] == 0x12345678)
-		return 0;
-	return 1;
-}
-]])],[ac_cv_have_little_endian_long_long=yes],[ac_cv_have_little_endian_long_long=no],[# Should try to guess here
-ac_cv_have_little_endian_long_long=no
-])])
-AC_MSG_RESULT($ac_cv_have_little_endian_long_long)
-if test "$ac_cv_have_little_endian_long_long" = yes
-then
-	AC_DEFINE([HAVE_LITTLE_ENDIAN_LONG_LONG], 1,
-[Define if long long is little-endian.])
-fi
-])
--- a/bjm.c
+++ b/bjm.c
@ -26,22 +26,15 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id$
 */
+
 #include "defs.h"
-
-#if defined(LINUX)
-
 #include <fcntl.h>
 #include <sys/stat.h>
-#include <sys/time.h>
 #include <sys/wait.h>
 #include <sys/resource.h>
 #include <sys/utsname.h>
 #include <sys/user.h>
-#include <sys/syscall.h>
-#include <signal.h>

 /* Bits of module.flags.  */

@ -49,7 +42,7 @@
 #define MOD_RUNNING		1
 #define MOD_DELETED		2
 #define MOD_AUTOCLEAN		4
-#define MOD_VISITED  		8
+#define MOD_VISITED		8
 #define MOD_USED_ONCE		16
 #define MOD_JUST_FREED		32
 #define MOD_INITIALIZING	64
@ -98,52 +91,54 @@ static const struct xlat modflags[] = {
 };

 int
-sys_query_module(tcp)
-struct tcb *tcp;
+sys_query_module(struct tcb *tcp)
 {
-
-	if (exiting(tcp)) {
+	if (entering(tcp)) {
 		printstr(tcp, tcp->u_arg[0], -1);
-		tprintf(", ");
+		tprints(", ");
 		printxval(which, tcp->u_arg[1], "QM_???");
-		tprintf(", ");
-		if (!verbose(tcp)) {
-			tprintf("%#lx, %lu, %#lx", tcp->u_arg[2], tcp->u_arg[3], tcp->u_arg[4]);
-		} else if (tcp->u_rval!=0) {
-			size_t	ret;
-			umove(tcp, tcp->u_arg[4], &ret);
-			tprintf("%#lx, %lu, %Zu", tcp->u_arg[2], tcp->u_arg[3], ret);
+		tprints(", ");
+	} else {
+		size_t ret;
+
+		if (!verbose(tcp) || syserror(tcp) ||
+		    umove(tcp, tcp->u_arg[4], &ret) < 0) {
+			tprintf("%#lx, %lu, %#lx", tcp->u_arg[2],
+				tcp->u_arg[3], tcp->u_arg[4]);
 		} else if (tcp->u_arg[1]==QM_INFO) {
 			struct module_info	mi;
-			size_t			ret;
-			umove(tcp, tcp->u_arg[2], &mi);
-			tprintf("{address=%#lx, size=%lu, flags=", mi.addr, mi.size);
-			printflags(modflags, mi.flags, "MOD_???");
-			tprintf(", usecount=%lu}", mi.usecount);
-			umove(tcp, tcp->u_arg[4], &ret);
-			tprintf(", %Zu", ret);
+			if (umove(tcp, tcp->u_arg[2], &mi) < 0) {
+				tprintf("%#lx, ", tcp->u_arg[2]);
+			} else {
+				tprintf("{address=%#lx, size=%lu, flags=",
+					mi.addr, mi.size);
+				printflags(modflags, mi.flags, "MOD_???");
+				tprintf(", usecount=%lu}, ", mi.usecount);
+			}
+			tprintf("%Zu", ret);
 		} else if ((tcp->u_arg[1]==QM_MODULES) ||
 			   (tcp->u_arg[1]==QM_DEPS) ||
 			   (tcp->u_arg[1]==QM_REFS)) {
-			size_t	ret;
-
-			umove(tcp, tcp->u_arg[4], &ret);
-			tprintf("{");
+			tprints("{");
 			if (!abbrev(tcp)) {
-				char*	data	= (char*)malloc(tcp->u_arg[3]);
+				char*	data	= malloc(tcp->u_arg[3]);
 				char*	mod	= data;
 				size_t	idx;

-				if (data==NULL) {
+				if (!data) {
 					fprintf(stderr, "out of memory\n");
 					tprintf(" /* %Zu entries */ ", ret);
 				} else {
-					umoven(tcp, tcp->u_arg[2], tcp->u_arg[3], data);
-					for (idx=0; idx<ret; idx++) {
-						if (idx!=0)
-							tprintf(",");
-						tprintf("%s", mod);
-						mod+=strlen(mod)+1;
+					if (umoven(tcp, tcp->u_arg[2],
+						tcp->u_arg[3], data) < 0) {
+						tprintf(" /* %Zu entries */ ", ret);
+					} else {
+						for (idx = 0; idx < ret; idx++) {
+							tprintf("%s%s",
+								(idx ? ", " : ""),
+								mod);
+							mod += strlen(mod)+1;
+						}
 					}
 					free(data);
 				}
@ -151,22 +146,27 @@ struct tcb *tcp;
 				tprintf(" /* %Zu entries */ ", ret);
 			tprintf("}, %Zu", ret);
 		} else if (tcp->u_arg[1]==QM_SYMBOLS) {
-			size_t	ret;
-			umove(tcp, tcp->u_arg[4], &ret);
-			tprintf("{");
+			tprints("{");
 			if (!abbrev(tcp)) {
-				char*			data	= (char *)malloc(tcp->u_arg[3]);
+				char*			data	= malloc(tcp->u_arg[3]);
 				struct module_symbol*	sym	= (struct module_symbol*)data;
 				size_t			idx;

-				if (data==NULL) {
+				if (!data) {
 					fprintf(stderr, "out of memory\n");
 					tprintf(" /* %Zu entries */ ", ret);
 				} else {
-					umoven(tcp, tcp->u_arg[2], tcp->u_arg[3], data);
-					for (idx=0; idx<ret; idx++) {
-						tprintf("{name=%s, value=%lu} ", data+(long)sym->name, sym->value);
-						sym++;
+					if (umoven(tcp, tcp->u_arg[2],
+						tcp->u_arg[3], data) < 0) {
+						tprintf(" /* %Zu entries */ ", ret);
+					} else {
+						for (idx = 0; idx < ret; idx++) {
+							tprintf("%s{name=%s, value=%lu}",
+								(idx ? " " : ""),
+								data+(long)sym->name,
+								sym->value);
+							sym++;
+						}
 					}
 					free(data);
 				}
@ -182,8 +182,7 @@ struct tcb *tcp;
 }

 int
-sys_create_module(tcp)
-struct tcb *tcp;
+sys_create_module(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		printpath(tcp, tcp->u_arg[0]);
@ -193,8 +192,7 @@ struct tcb *tcp;
 }

 int
-sys_init_module(tcp)
-struct tcb *tcp;
+sys_init_module(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		tprintf("%#lx, ", tcp->u_arg[0]);
@ -203,4 +201,3 @@ struct tcb *tcp;
 	}
 	return 0;
 }
-#endif /* LINUX */
--- a/block.c
+++ b/block.c
@ -0,0 +1,283 @@
+/*
+ * Copyright (c) 2009, 2010 Jeff Mahoney <jeffm@suse.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "defs.h"
+#include <linux/blkpg.h>
+#include <linux/fs.h>
+#include <linux/hdreg.h>
+
+/* ioctls <= 114 are present in Linux 2.4. The following ones have been
+ * added since then and headers containing them may not be available on
+ * every system. */
+
+#define BLKTRACE_BDEV_SIZE      32
+struct blk_user_trace_setup {
+	char name[BLKTRACE_BDEV_SIZE];	/* output */
+	uint16_t act_mask;		/* input */
+	uint32_t buf_size;		/* input */
+	uint32_t buf_nr;		/* input */
+	uint64_t start_lba;
+	uint64_t end_lba;
+	uint32_t pid;
+};
+
+#ifndef BLKTRACESETUP
+#define BLKTRACESETUP _IOWR(0x12,115,struct blk_user_trace_setup)
+#endif
+#ifndef BLKTRACESTART
+#define BLKTRACESTART _IO(0x12,116)
+#endif
+#ifndef BLKTRACESTOP
+#define BLKTRACESTOP _IO(0x12,117)
+#endif
+#ifndef BLKTRACETEARDOWN
+#define BLKTRACETEARDOWN _IO(0x12,118)
+#endif
+#ifndef BLKDISCARD
+#define BLKDISCARD _IO(0x12,119)
+#endif
+#ifndef BLKIOMIN
+#define BLKIOMIN _IO(0x12,120)
+#endif
+#ifndef BLKIOOPT
+#define BLKIOOPT _IO(0x12,121)
+#endif
+#ifndef BLKALIGNOFF
+#define BLKALIGNOFF _IO(0x12,122)
+#endif
+#ifndef BLKPBSZGET
+#define BLKPBSZGET _IO(0x12,123)
+#endif
+#ifndef BLKDISCARDZEROES
+#define BLKDISCARDZEROES _IO(0x12,124)
+#endif
+#ifndef BLKSECDISCARD
+#define BLKSECDISCARD _IO(0x12,125)
+#endif
+
+static const struct xlat blkpg_ops[] = {
+	{ BLKPG_ADD_PARTITION,	"BLKPG_ADD_PARTITION", },
+	{ BLKPG_DEL_PARTITION,	"BLKPG_DEL_PARTITION", },
+	{ 0,			NULL },
+};
+
+static void
+print_blkpg_req(struct tcb *tcp, struct blkpg_ioctl_arg *blkpg)
+{
+	struct blkpg_partition p;
+
+	tprints("{");
+	printxval(blkpg_ops, blkpg->op, "BLKPG_???");
+
+	tprintf(", flags=%d, datalen=%d, ",
+		blkpg->flags, blkpg->datalen);
+
+	if (umove(tcp, (long) blkpg->data, &p) < 0)
+		tprintf("%#lx}", (long) blkpg->data);
+	else
+		tprintf("{start=%lld, length=%lld, pno=%d, "
+			"devname=\"%.*s\", volname=\"%.*s\"}}",
+			p.start, p.length, p.pno,
+			(int) sizeof(p.devname), p.devname,
+			(int) sizeof(p.volname), p.volname);
+}
+
+int
+block_ioctl(struct tcb *tcp, long code, long arg)
+{
+	switch (code) {
+	/* take arg as a value, not as a pointer */
+	case BLKRASET:
+	case BLKFRASET:
+		if (entering(tcp))
+			tprintf(", %ld", arg);
+		break;
+
+	/* take a signed int */
+	case BLKROSET:
+	case BLKBSZSET:
+		if (entering(tcp)) {
+			int val;
+			if (umove(tcp, arg, &val) < 0)
+				tprintf(", %#lx", arg);
+			else
+				tprintf(", %d", val);
+		}
+		break;
+
+	/* returns an unsigned short */
+	case BLKSECTGET:
+		if (exiting(tcp)) {
+			unsigned short val;
+			if (syserror(tcp) || umove(tcp, arg, &val) < 0)
+				tprintf(", %#lx", arg);
+			else
+				tprintf(", %u", (unsigned)val);
+		}
+		break;
+
+	/* return a signed int */
+	case BLKROGET:
+	case BLKBSZGET:
+	case BLKSSZGET:
+	case BLKALIGNOFF:
+		if (exiting(tcp)) {
+			int val;
+			if (syserror(tcp) || umove(tcp, arg, &val) < 0)
+				tprintf(", %#lx", arg);
+			else
+				tprintf(", %d", val);
+		}
+		break;
+
+	/* return an unsigned int */
+	case BLKPBSZGET:
+	case BLKIOMIN:
+	case BLKIOOPT:
+	case BLKDISCARDZEROES:
+		if (exiting(tcp)) {
+			unsigned int val;
+			if (syserror(tcp) || umove(tcp, arg, &val) < 0)
+				tprintf(", %#lx", arg);
+			else
+				tprintf(", %u", val);
+		}
+		break;
+
+	/* return a signed long */
+	case BLKRAGET:
+	case BLKFRAGET:
+		if (exiting(tcp)) {
+			long val;
+			if (syserror(tcp) || umove(tcp, arg, &val) < 0)
+				tprintf(", %#lx", arg);
+			else
+				tprintf(", %ld", val);
+		}
+		break;
+
+	/* returns an unsigned long */
+	case BLKGETSIZE:
+		if (exiting(tcp)) {
+			unsigned long val;
+			if (syserror(tcp) || umove(tcp, arg, &val) < 0)
+				tprintf(", %#lx", arg);
+			else
+				tprintf(", %lu", val);
+			}
+		break;
+
+#ifdef HAVE_BLKGETSIZE64
+	/* return an uint64_t */
+	case BLKGETSIZE64:
+		if (exiting(tcp)) {
+			uint64_t val;
+			if (syserror(tcp) || umove(tcp, arg, &val) < 0)
+				tprintf(", %#lx", arg);
+			else
+				tprintf(", %" PRIu64, val);
+		}
+		break;
+#endif
+
+	/* More complex types */
+	case BLKDISCARD:
+	case BLKSECDISCARD:
+		if (entering(tcp)) {
+			uint64_t range[2];
+			if (umove(tcp, arg, range) < 0)
+				tprintf(", %#lx", arg);
+			else
+				tprintf(", {%" PRIx64 ", %" PRIx64 "}",
+					range[0], range[1]);
+		}
+		break;
+
+	case HDIO_GETGEO:
+		if (exiting(tcp)) {
+			struct hd_geometry geo;
+			if (syserror(tcp) || umove(tcp, arg, &geo) < 0)
+				tprintf(", %#lx", arg);
+			else
+				tprintf(", {heads=%u, sectors=%u, "
+					"cylinders=%u, start=%lu}",
+					(unsigned)geo.heads,
+					(unsigned)geo.sectors,
+					(unsigned)geo.cylinders,
+					geo.start);
+		}
+		break;
+
+	case BLKPG:
+		if (entering(tcp)) {
+			struct blkpg_ioctl_arg blkpg;
+			if (umove(tcp, arg, &blkpg) < 0)
+				tprintf(", %#lx", arg);
+			else {
+				tprints(", ");
+				print_blkpg_req(tcp, &blkpg);
+			}
+		}
+		break;
+
+	case BLKTRACESETUP:
+		if (entering(tcp)) {
+			struct blk_user_trace_setup buts;
+			if (umove(tcp, arg, &buts) < 0)
+				tprintf(", %#lx", arg);
+			else
+				tprintf(", {act_mask=%u, buf_size=%u, "
+					"buf_nr=%u, start_lba=%" PRIu64 ", "
+					"end_lba=%" PRIu64 ", pid=%u}",
+					(unsigned)buts.act_mask, buts.buf_size,
+					buts.buf_nr, buts.start_lba,
+					buts.end_lba, buts.pid);
+		}
+		if (exiting(tcp)) {
+			struct blk_user_trace_setup buts;
+			if (syserror(tcp) || umove(tcp, arg, &buts) < 0)
+				tprintf(", %#lx", arg);
+			else
+				tprintf(", {name=\"%.*s\"}",
+					(int) sizeof(buts.name), buts.name);
+		}
+		break;
+
+	/* No arguments or unhandled */
+	case BLKTRACESTART:
+	case BLKTRACESTOP:
+	case BLKTRACETEARDOWN:
+	case BLKFLSBUF: /* Requires driver knowlege */
+	case BLKRRPART: /* No args */
+	default:
+		if (entering(tcp))
+			tprintf(", %#lx", arg);
+		break;
+
+	};
+	return 1;
+}
--- a/configure.ac
+++ b/configure.ac
@ -1,46 +1,15 @@
 dnl Process this file with autoconf to create configure.  Use autoreconf.
 AC_PREREQ(2.57)
-AC_INIT([strace],[4.5.19])
+AC_INIT([strace],[4.7])
 AC_CONFIG_SRCDIR([strace.c])
 AC_CONFIG_AUX_DIR([.])
 AM_CONFIG_HEADER([config.h])
-AM_INIT_AUTOMAKE([foreign check-news dist-bzip2 no-dist-gzip])
+AM_INIT_AUTOMAKE([foreign check-news dist-xz no-dist-gzip silent-rules])
 AM_MAINTAINER_MODE
 AC_CANONICAL_HOST

-AC_MSG_CHECKING([for supported operating system])
-case "$host_os" in
-*linux*)
-	opsys=linux
-	AC_DEFINE([LINUX], 1, [Define for the Linux operating system.])
-	;;
-sunos4*)
-	opsys=sunos4
-	AC_DEFINE([SUNOS4], 1, [Define for the SunOS 4.x operating system.])
-	;;
-solaris2* | sysv[[45]]* | irix[[56]]*)
-	opsys=svr4
-	AC_DEFINE([SVR4], 1, [Define for the System V release 4 operating
-system or a derivative like Solaris 2.x or Irix 5.x.])
-	case "$host_os" in
-	sysv4.2uw*)
-		AC_DEFINE(UNIXWARE, 2, [Define for UnixWare systems.])
-		;;
-	sysv5*)
-		AC_DEFINE(UNIXWARE, 7, [Define for UnixWare systems.])
-		;;
-	esac
-	;;
-freebsd*)
-	opsys=freebsd
-	AC_DEFINE([FREEBSD], 1, [Define for the FreeBSD operating system.])
-	;;
-*)
-	AC_MSG_RESULT([NO!])
-	AC_MSG_ERROR([operating system $host_os is not supported by strace])
-	;;
-esac
-AC_MSG_RESULT($opsys)
+AC_PROG_CC
+AC_USE_SYSTEM_EXTENSIONS

 AC_MSG_CHECKING([for supported architecture])
 case "$host_cpu" in
@ -79,6 +48,9 @@ alpha*)
 powerpc*)
 	arch=powerpc
 	AC_DEFINE([POWERPC], 1, [Define for the PowerPC architecture.])
+	if test $host_cpu = powerpc64; then
+		AC_DEFINE([POWERPC64], 1, [Define for the PowerPC64 architecture.])
+	fi
 	;;
 arm*)
 	arch=arm
@ -109,8 +81,15 @@ sh*)
 	AC_DEFINE([SH], 1, [Define for the SH architecture.])
 	;;
 x86?64*)
-	arch=x86_64
-	AC_DEFINE([X86_64], 1, [Define for the AMD x86-64 architecture.])
+	AC_TRY_COMPILE(
+[#ifndef __ILP32__
+# error not x32
+#endif], [], arch=x32, arch=x86_64)
+	if test "$arch" = "x86_64"; then
+		AC_DEFINE([X86_64], 1, [Define for the 64bit AMD x86-64 architecture.])
+	else
+		AC_DEFINE([X32], 1, [Define for the 32bit AMD x86-64 architecture.])
+	fi
 	;;
 cris|crisv10)
 	arch=crisv10
@ -120,6 +99,14 @@ crisv32)
 	arch=crisv32
 	AC_DEFINE([CRISV32], 1, [Define for the CRISv32 architecture.])
 	;;
+tile*)
+	arch=tile
+	AC_DEFINE([TILE], 1, [Define for the Tile architecture])
+	;;
+microblaze*)
+	arch=microblaze
+	AC_DEFINE([MICROBLAZE], 1, [Define for the MicroBlaze architecture.])
+	;;
 *)
 	AC_MSG_RESULT([NO!])
 	AC_MSG_ERROR([architecture $host_cpu is not supported by strace])
@ -127,66 +114,38 @@ crisv32)
 esac
 AC_MSG_RESULT($arch)

-AC_SUBST(opsys)
 AC_SUBST(arch)

-AM_CONDITIONAL([LINUX], [test x$opsys = xlinux])
 AM_CONDITIONAL([I386], [test x$arch = xi386])
 AM_CONDITIONAL([X86_64], [test x$arch = xx86_64])
-AM_CONDITIONAL([SUNOS4], [test x$opsys = xsunos4])
-AM_CONDITIONAL([SVR4], [test x$opsys = xsvr4])
-AM_CONDITIONAL([FREEBSD], [test x$opsys = xfreebsd])
-
-AC_PROG_CC
-AC_GNU_SOURCE
+AM_CONDITIONAL([X32], [test x$arch = xx32])

 AC_INCLUDEDIR

-if test "x$opsys" = "xsunos4" && test "x$arch" = "xsparc"
-then
-	AC_MSG_CHECKING(for valid machine include directory)
-	if test -d "$includedir/sun4"
-	then
-		rm -f machine
-		ln -s $includedir/sun4 machine
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(SUNOS4_KERNEL_ARCH_KLUDGE, 1, [
-Define if you are have a SPARC with SUNOS4 and your want a version
-of strace that will work on sun4, sun4c and sun4m kernel architectures.
-Only useful if you have a symbolic link from machine to /usr/include/sun4
-in the compilation directory.])
-	else
-		AC_MSG_RESULT(no)
-	fi
-fi
-
-AC_WARNFLAGS
-if test "x$opsys" = "xsunos4"
-then
-	if test -n "$GCC"
-	then
-		# SunOS 4.x header files don't declare int functions.
-		WARNFLAGS="$WARNFLAGS -Wno-implicit"
-	fi
-fi
+gl_WARN_ADD([-Wall])
+gl_WARN_ADD([-Wwrite-strings])
+AC_SUBST([WARN_CFLAGS])

 AC_PROG_CPP
-AC_PROG_GCC_TRADITIONAL
 AC_PROG_INSTALL
 AC_C_CONST
+AC_C_BIGENDIAN
 AC_HEADER_STDC
 AC_HEADER_STDBOOL
 AC_HEADER_DIRENT
 AC_HEADER_STAT
-AC_CHECK_MEMBERS([struct stat.st_blksize,
-		  struct stat.st_blocks,
-		  struct stat.st_aclcnt,
-		  struct stat.st_flags,
-		  struct stat.st_fstype,
-		  struct stat.st_gen,
-		  struct stat.st_level,
-		  struct stat.st_rdev])
+AC_CHECK_MEMBERS(m4_normalize([
+	struct stat.st_aclcnt,
+	struct stat.st_blksize,
+	struct stat.st_blocks,
+	struct stat.st_flags,
+	struct stat.st_fstype,
+	struct stat.st_gen,
+	struct stat.st_level,
+	struct stat.st_rdev
+]))
 AC_STAT64
+AC_STATFS64

 AC_TYPE_SIGNAL
 AC_TYPE_UID_T
@ -201,74 +160,58 @@ AC_CHECK_MEMBERS([struct sockaddr_in6.sin6_scope_id],,,
 AC_CHECK_TYPES([long long])
 AC_LITTLE_ENDIAN_LONG_LONG
 AC_OFF_T_IS_LONG_LONG
-AC_RLIM_T_IS_LONG_LONG
 AC_CHECK_TYPES([struct opthdr],,, [#include <sys/socket.h>])
 AC_CHECK_TYPES([struct t_opthdr],,, [#include <sys/tiuser.h>])

-if test x$opsys != xlinux; then
-AC_CHECK_LIB(nsl, main)
-fi
-
-AC_CHECK_FUNCS([ \
-	fork \
-	getdents \
-	if_indextoname \
-	inet_ntop \
-	mctl \
-	prctl \
-	pread \
-	sendmsg \
-	sigaction \
-	strerror \
-	strsignal \
-	sys_siglist \
-	_sys_siglist \
-])
-AC_CHECK_HEADERS([ \
-	inttypes.h \
-	ioctls.h \
-	libaio.h \
-	mqueue.h \
-	poll.h \
-	stropts.h \
-	termio.h \
-	sys/acl.h \
-	sys/aio.h \
-	sys/asynch.h \
-	sys/conf.h \
-	sys/door.h \
-	sys/epoll.h \
-	sys/filio.h \
-	sys/ioctl.h \
-	sys/nscsys.h \
-	sys/poll.h \
-	sys/ptrace.h \
-	sys/reg.h \
-	sys/stream.h \
-	sys/sysconfig.h \
-	sys/tihdr.h \
-	sys/tiuser.h \
-	sys/uio.h \
-	sys/vfs.h \
-	asm/cachectl.h \
-	asm/sysmips.h \
-	linux/capability.h \
-	linux/ptrace.h \
-	linux/utsname.h \
-], [], [])
+AC_CHECK_FUNCS(m4_normalize([
+	fork
+	if_indextoname
+	inet_ntop
+	prctl
+	process_vm_readv
+	sendmsg
+	sigaction
+	stpcpy
+	strerror
+	strsignal
+	_sys_siglist
+	sys_siglist
+]))
+AC_CHECK_HEADERS(m4_normalize([
+	asm/cachectl.h
+	asm/sysmips.h
+	inttypes.h
+	ioctls.h
+	libaio.h
+	linux/capability.h
+	linux/ptrace.h
+	linux/utsname.h
+	mqueue.h
+	netinet/sctp.h
+	poll.h
+	stropts.h
+	sys/acl.h
+	sys/asynch.h
+	sys/conf.h
+	sys/epoll.h
+	sys/filio.h
+	sys/ioctl.h
+	sys/poll.h
+	sys/ptrace.h
+	sys/reg.h
+	sys/uio.h
+	sys/vfs.h
+]))
 AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h],
                 [], [], [#include <stddef.h>
-#include <linux/socket.h>])
+#include <sys/socket.h>
+#include <asm/types.h>])
 AC_CHECK_HEADERS([asm/sigcontext.h], [], [], [#include <signal.h>])
 AC_CHECK_TYPES([struct sigcontext_struct,
 		struct sigcontext],,, [#include <signal.h>])
 AC_CHECK_HEADERS([netinet/tcp.h netinet/udp.h],,, [#include <netinet/in.h>])

-AC_MP_PROCFS
-AC_POLLABLE_PROCFS
-
 AC_CHECK_MEMBERS([struct msghdr.msg_control],,, [#include <sys/socket.h>])
-AC_STRUCT_PR_SYSCALL

 AC_CHECK_MEMBERS([struct T_conn_res.QUEUE_ptr,
                  struct T_conn_res.ACCEPTOR_id],,,
@ -289,11 +232,46 @@ AC_CHECK_MEMBERS([struct sigcontext.sc_hi2],,, [#include <signal.h>
 # include <asm/sigcontext.h>
 #endif])

+AC_CHECK_MEMBERS([struct utsname.domainname],,, [#include <sys/utsname.h>])

 AC_CHECK_DECLS([sys_errlist])
 AC_CHECK_DECLS([sys_siglist, _sys_siglist],,, [#include <signal.h>])
+AC_CHECK_DECLS(m4_normalize([
+	PTRACE_EVENT_CLONE,
+	PTRACE_EVENT_EXEC,
+	PTRACE_EVENT_EXIT,
+	PTRACE_EVENT_FORK,
+	PTRACE_EVENT_VFORK,
+	PTRACE_EVENT_VFORK_DONE,
+	PTRACE_GETEVENTMSG,
+	PTRACE_GETSIGINFO,
+	PTRACE_O_TRACECLONE,
+	PTRACE_O_TRACEEXEC,
+	PTRACE_O_TRACEEXIT,
+	PTRACE_O_TRACEFORK,
+	PTRACE_O_TRACESYSGOOD,
+	PTRACE_O_TRACEVFORK,
+	PTRACE_SETOPTIONS
+]),,, [#include <sys/ptrace.h>])
+
+AC_CHECK_DECLS(m4_normalize([
+	LO_FLAGS_AUTOCLEAR,
+	LO_FLAGS_PARTSCAN
+]),,, [#include <linux/loop.h>])
+
+AC_CACHE_CHECK([for BLKGETSIZE64], [ac_cv_have_blkgetsize64],
+	[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+#include <stdlib.h>
+#include <linux/fs.h>], [return !BLKGETSIZE64;])],
+			   [ac_cv_have_blkgetsize64=yes], [ac_cv_have_blkgetsize64=no])]
+	if test $ac_cv_have_blkgetsize64 = yes; then
+		AC_DEFINE([HAVE_BLKGETSIZE64], [1], [Define to 1 if you have BLKGETSIZE64.])
+	fi)
+
+AC_CHECK_SIZEOF([long])
+AC_CHECK_SIZEOF([rlim_t],,[#include <sys/resource.h>])

 AC_PATH_PROG([PERL], [perl])

-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile tests/Makefile])
 AC_OUTPUT
--- a/count.c
+++ b/count.c
@ -31,8 +31,6 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id$
 */

 #include "defs.h"
@ -47,22 +45,16 @@ static struct call_counts *countv[SUPPORTED_PERSONALITIES];

 static struct timeval shortest = { 1000000, 0 };

-int
+void
 count_syscall(struct tcb *tcp, struct timeval *tv)
 {
-	tcp->flags &= ~TCB_INSYSCALL;
-	if (tcp->scno < 0 || tcp->scno >= nsyscalls)
-		return 0;
+	if (!SCNO_IN_RANGE(tcp->scno))
+		return;

-	if (!counts)
-	{
+	if (!counts) {
 		counts = calloc(nsyscalls, sizeof(*counts));
 		if (!counts)
-		{
-			fprintf(stderr,
-				"strace: out of memory for call counts\n");
-			exit(1);
-		}
+			die_out_of_memory();
 	}

 	counts[tcp->scno].calls++;
@ -70,13 +62,10 @@ count_syscall(struct tcb *tcp, struct timeval *tv)
 		counts[tcp->scno].errors++;

 	tv_sub(tv, tv, &tcp->etime);
-#ifdef LINUX
-	if (tv_cmp(tv, &tcp->dtime) > 0)
-	{
+	if (tv_cmp(tv, &tcp->dtime) > 0) {
 		static struct timeval one_tick;

-		if (one_tick.tv_usec == 0)
-		{
+		if (one_tick.tv_usec == 0) {
 			/* Initialize it.  */
 			struct itimerval it;

@ -89,20 +78,16 @@ count_syscall(struct tcb *tcp, struct timeval *tv)

 		if (tv_nz(&tcp->dtime))
 			*tv = tcp->dtime;
-		else if (tv_cmp(tv, &one_tick) > 0)
-		{
+		else if (tv_cmp(tv, &one_tick) > 0) {
 			if (tv_cmp(&shortest, &one_tick) < 0)
 				*tv = shortest;
 			else
 				*tv = one_tick;
 		}
 	}
-#endif /* LINUX */
 	if (tv_cmp(tv, &shortest) < 0)
 		shortest = *tv;
 	tv_add(&counts[tcp->scno].time, &counts[tcp->scno].time, tv);
-
-	return 0;
 }

 static int
@ -132,7 +117,7 @@ static int (*sortfun)();
 static struct timeval overhead = { -1, -1 };

 void
-set_sortby(char *sortby)
+set_sortby(const char *sortby)
 {
 	if (strcmp(sortby, "time") == 0)
 		sortfun = time_cmp;
@ -142,10 +127,8 @@ set_sortby(char *sortby)
 		sortfun = syscall_cmp;
 	else if (strcmp(sortby, "nothing") == 0)
 		sortfun = NULL;
-	else
-	{
-		fprintf(stderr, "invalid sortby: `%s'\n", sortby);
-		exit(1);
+	else {
+		error_msg_and_die("invalid sortby: '%s'", sortby);
 	}
 }

@ -162,24 +145,19 @@ call_summary_pers(FILE *outf)
 	int     call_cum, error_cum;
 	struct timeval tv_cum, dtv;
 	double  percent;
-	char   *dashes = "-------------------------";
+	const char *dashes = "-------------------------";
 	char    error_str[16];
 	int    *sorted_count = calloc(sizeof(int), nsyscalls);

 	if (!sorted_count)
-	{
-		fprintf(stderr, "strace: out of memory for call summary\n");
-		return;
-	}
+		die_out_of_memory();

 	call_cum = error_cum = tv_cum.tv_sec = tv_cum.tv_usec = 0;
-	if (overhead.tv_sec == -1)
-	{
+	if (overhead.tv_sec == -1) {
 		tv_mul(&overhead, &shortest, 8);
 		tv_div(&overhead, &overhead, 10);
 	}
-	for (i = 0; i < nsyscalls; i++)
-	{
+	for (i = 0; i < nsyscalls; i++) {
 		sorted_count[i] = i;
 		if (counts == NULL || counts[i].calls == 0)
 			continue;
@ -196,10 +174,8 @@ call_summary_pers(FILE *outf)
 		"calls", "errors", "syscall");
 	fprintf(outf, "%6.6s %11.11s %11.11s %9.9s %9.9s %-16.16s\n",
 		dashes, dashes, dashes, dashes, dashes, dashes);
-	if (counts)
-	{
-		for (i = 0; i < nsyscalls; i++)
-		{
+	if (counts) {
+		for (i = 0; i < nsyscalls; i++) {
 			j = sorted_count[i];
 			if (counts[j].calls == 0)
 				continue;
@ -212,7 +188,7 @@ call_summary_pers(FILE *outf)
 				   / tv_float(&tv_cum));
 			fprintf(outf, "%6.2f %11.6f %11ld %9d %9.9s %s\n",
 				percent, tv_float(&counts[j].time),
-				(long) 1000000 * dtv.tv_sec + dtv.tv_usec,
+				(long) (1000000 * dtv.tv_sec + dtv.tv_usec),
 				counts[j].calls,
 				error_str, sysent[j].sys_name);
 		}
@ -233,10 +209,9 @@ call_summary_pers(FILE *outf)
 void
 call_summary(FILE *outf)
 {
-	int     i, old_pers = current_personality;
+	int i, old_pers = current_personality;

-	for (i = 0; i < SUPPORTED_PERSONALITIES; ++i)
-	{
+	for (i = 0; i < SUPPORTED_PERSONALITIES; ++i) {
 		if (!countv[i])
 			continue;

@ -244,8 +219,8 @@ call_summary(FILE *outf)
 			set_personality(i);
 		if (i)
 			fprintf(outf,
-				"System call usage summary for %u bit mode:\n",
-				personality_wordsize[current_personality] * 8);
+				"System call usage summary for %d bit mode:\n",
+				(int) (current_wordsize * 8));
 		call_summary_pers(outf);
 	}

--- a/debian/.cvsignore
+++ b/debian/.cvsignore
@ -1,3 +0,0 @@
-substvars
-files
-tmp
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,81 @@
+strace (4.7-1) unstable; urgency=low
+
+  * New upstream version.
+    + Fixed sockaddr_un.sun_path name in decoded output, closes: #554946
+    + Avoid potential core file clobbering on exit, closes: #656398
+    + Fixed a typo in documentation, closes: #653309
+
+ -- Dmitry V. Levin <ldv@altlinux.org>  Wed, 02 May 2012 12:34:56 +0000
+
+strace (4.6-1) unstable; urgency=low
+
+  * New upstream version.
+    + Added HDIO_* ioctl names, closes: #450953
+    + Fixed stat64 decoding on mips, closes: #599028
+    + Fixed misleading italics in the manual page, closes: #589323
+
+ -- Dmitry V. Levin <ldv@altlinux.org>  Mon, 14 Mar 2011 15:16:17 +0000
+
+strace (4.5.20-2.3) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add sh4 to arch list.
+  * Add powerpcspe to arch list (Closes: #579842).
+
+ -- Nobuhiro Iwamatsu <iwamatsu@debian.org>  Tue, 22 Mar 2011 09:03:49 +0900
+
+strace (4.5.20-2.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add sh4 to arch list (Closes: #537105).
+
+ -- Nobuhiro Iwamatsu <iwamatsu@debian.org>  Wed, 09 Mar 2011 09:22:01 +0900
+
+strace (4.5.20-2.1) unstable; urgency=low
+
+  * NMU, added armhf support. (Closes: #596960)
+
+ -- Konstantinos Margaritis <markos@debian.org>  Thu, 24 Feb 2011 14:47:54 +0000
+
+strace (4.5.20-2) unstable; urgency=low
+
+  * Add missing sparc syscall defines to fix FTBFS on sparc.
+
+ -- Frederik Schüler <fs@debian.org>  Tue, 04 May 2010 14:31:46 +0200
+
+strace (4.5.20-1) unstable; urgency=low
+
+  [ Dmitry V. Levin ]
+  * New upstream version.
+    + Corrected decoding of 64bit syscalls, closes: #570603
+    + Corrected getsockopt decoding on architectures where
+      sizeof(long) > sizeof(int), closes: #494844
+    + Corrected decoding of epoll_pwait, closes: #513014
+    + Implemented -C option to combine regular and -c output, closes: #466196
+
+  [ Frederik Schüler ]
+  * Update standards-version to 3.8.4.
+  * debian/rules: allow parallel building.
+  * debian/rules: comment out verbose build, only needed for debugging.
+  * debian/rules: clean up clean: target, dh_clean does most of the work
+    already.
+  * debian/rules: use *-stamp instead of stamp-*, so dh_clean can tidy
+    up for us.
+
+ -- Frederik Schüler <fs@debian.org>  Tue, 13 Apr 2010 13:02:57 +0200
+
+strace (4.5.19-2) unstable; urgency=low
+
+  * Add sparc64 to the architectures list, closes: #560062
+  * Fix FTBFS, thanks to Aurelien Jarno <aurelien@aurel32.net> for pointing
+    out the solution. Closes: #560516
+  * Rebuild as normal package, closes: #566968
+  * Update standards-version to 3.8.3.
+  * Lower package priority to optional, matching the archive override.
+  * Add watch file.
+
+ -- Frederik Schüler <fs@debian.org>  Tue, 26 Jan 2010 12:20:51 +0100
+
 strace (4.5.19-1) unstable; urgency=low

  [ Dmitry V. Levin ]
@ -5,6 +83,7 @@ strace (4.5.19-1) unstable; urgency=low
    + Fixed FTBFS on armel, closes: #520084, #535564
    + Marked sendfile(2) as a network syscall, closes: #509499
    + Fixed syscall numbers for tee and sync_file_range, closes: #503124
+    + Corrected accept(2) decoding, closes: #507573
    + Changed strace to exit/kill with traced process
      exitcode/signal, closes: #37665

--- a/debian/control
+++ b/debian/control
@ -1,16 +1,14 @@
 Source: strace
 Maintainer: Frederik Schüler <fs@debian.org>
 Section: utils
-Priority: standard
+Priority: optional
 Build-Depends: libc6-dev (>= 2.2.2) [!alpha !ia64], libc6.1-dev (>= 2.2.2) [alpha ia64], gcc-multilib [i386 powerpc s390 sparc], debhelper (>= 7.0.0)
-Standards-Version: 3.8.1.0
+Standards-Version: 3.8.4
 Homepage: http://sourceforge.net/projects/strace/

 Package: strace
-Architecture: alpha amd64 arm armeb armel hppa i386 ia64 m68k mips mipsel powerpc ppc64 s390 s390x sh sparc
-Section: utils
-Priority: standard
-Depends: ${shlibs:Depends}
+Architecture: alpha amd64 arm armeb armel armhf hppa i386 ia64 m68k mips mipsel powerpc powerpcspe ppc64 s390 s390x sh4 sparc sparc64
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: A system call tracer
 strace is a system call tracer, i.e. a debugging tool which prints out
 a trace of all the system calls made by a another process/program.
@ -23,9 +21,8 @@ Description: A system call tracer

 Package: strace64
 Architecture: i386 powerpc s390 sparc
-Section: utils
 Priority: extra
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: A system call tracer for 64bit binaries
 strace is a system call tracer, i.e. a debugging tool which prints out
 a trace of all the system calls made by a another process/program.
@ -43,8 +40,8 @@ Package: strace-udeb
 Section: debian-installer
 XC-Package-Type: udeb
 Priority: extra
-Architecture: alpha amd64 arm armeb armel hppa i386 ia64 m68k mips mipsel powerpc ppc64 s390 sh sparc
-Depends: ${shlibs:Depends}
+Architecture: alpha amd64 arm armeb armel armhf hppa i386 ia64 m68k mips mipsel powerpc powerpcspe ppc64 s390 sh4 sparc sparc64
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: A system call tracer
 strace is a system call tracer, i.e. a debugging tool which prints out
 a trace of all the system calls made by a another process/program.
--- a/debian/copyright
+++ b/debian/copyright
@ -37,5 +37,3 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-$Id$
--- a/debian/rules
+++ b/debian/rules
@ -2,6 +2,19 @@

 #export DH_VERBOSE=1

+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+  CFLAGS += -O0
+else
+  CFLAGS += -O2
+endif
+
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+  NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+  MAKEFLAGS += -j$(NUMJOBS)
+endif
+
 DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
@ -11,7 +24,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH)=%, $(arch64_map)))
  HOST64 = $(strip $(patsubst $(DEB_HOST_ARCH)=%, %, \
 	     $(filter $(DEB_HOST_ARCH)=%, $(arch64_map))))-linux-gnu
  CC64 = gcc -m64
-  extra_build_targets += stamp-build64
+  extra_build_targets += build64-stamp
 endif

 ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
@ -20,10 +33,13 @@ else
  CONFIG_OPTS = --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
 endif

-all build: stamp-build $(extra_build_targets)
+all build: build-stamp $(extra_build_targets)

-stamp-%: %/Makefile
+%-stamp: %/Makefile
 	$(MAKE) -C $*
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+	$(MAKE) -C $* check
+endif
 	touch $@

 build/Makefile:
@ -35,20 +51,20 @@ build64/Makefile:
 	cd $(@D); CC="$(CC64)" sh ../configure --prefix=/usr --build=$(DEB_BUILD_GNU_TYPE) --host=$(HOST64)

 clean:
+	dh_testdir
+	dh_testroot
+	rm -rf build build64 strace64.1
 	dh_clean
-	rm -rf debian/strace debian/strace-udeb debian/substvars debian/files debian/files~
-	rm -rf build64 stamp-build64 strace64.1
-	rm -rf build stamp-build

 binary: binary-indep binary-arch

 binary-indep:

-binary-arch: build checkroot
-	test -f stamp-build || make $(MFLAGS) -f debian/rules build
+binary-arch: build
+	test -f build-stamp || make $(MFLAGS) -f debian/rules build

 	# prepare 64bit executable and manpage, if it has been built
-	test -f stamp-build64 && ( mv build64/strace build64/strace64 ; \
+	test -f build64-stamp && ( mv build64/strace build64/strace64 ; \
 		cp strace.1 strace64.1 ) || true

 	dh_testdir -s
@ -68,6 +84,3 @@ binary-arch: build checkroot
 	dh_gencontrol -s
 	dh_md5sums -s
 	dh_builddeb -s
-
-checkroot:
-	test root = "`whoami`"
--- a/debian/source/format
+++ b/debian/source/format
@ -0,0 +1 @@
+3.0 (quilt)
--- a/debian/watch
+++ b/debian/watch
@ -0,0 +1,2 @@
+version=3
+opts="uversionmangle=s/-/./g" http://sf.net/strace/strace-([[:digit:].-]*)\.tar\.xz
--- a/defs.h
+++ b/defs.h
--- a/desc.c
+++ b/desc.c
@ -26,33 +26,26 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id$
 */

 #include "defs.h"
-
 #include <fcntl.h>
 #include <sys/file.h>
-#ifdef LINUX
-#include <inttypes.h>
-#endif
 #ifdef HAVE_SYS_EPOLL_H
-#include <sys/epoll.h>
+# include <sys/epoll.h>
 #endif
 #ifdef HAVE_LIBAIO_H
-#include <libaio.h>
+# include <libaio.h>
 #endif

 #if HAVE_LONG_LONG_OFF_T
 /*
 * Hacks for systems that have a long long off_t
 */
-#define flock64	flock		/* Horrid hack */
-#define printflock printflock64	/* Horrider hack */
+# define flock64	flock		/* Horrid hack */
+# define printflock printflock64	/* Horrider hack */
 #endif

-
 static const struct xlat fcntlcmds[] = {
 	{ F_DUPFD,	"F_DUPFD"	},
 	{ F_GETFD,	"F_GETFD"	},
@ -237,8 +230,8 @@ printflock(struct tcb *tcp, long addr, int getlk)
 	struct flock fl;

 #if SUPPORTED_PERSONALITIES > 1
-	if (personality_wordsize[current_personality] != sizeof(fl.l_start)) {
-		if (personality_wordsize[current_personality] == 4) {
+	if (current_wordsize != sizeof(fl.l_start)) {
+		if (current_wordsize == 4) {
 			/* 32-bit x86 app on x86_64 and similar cases */
 			struct {
 				short int l_type;
@ -248,7 +241,7 @@ printflock(struct tcb *tcp, long addr, int getlk)
 				int32_t l_pid; /* pid_t */
 			} fl32;
 			if (umove(tcp, addr, &fl32) < 0) {
-				tprintf("{...}");
+				tprints("{...}");
 				return;
 			}
 			fl.l_type = fl32.l_type;
@ -259,26 +252,26 @@ printflock(struct tcb *tcp, long addr, int getlk)
 		} else {
 			/* let people know we have a problem here */
 			tprintf("{ <decode error: unsupported wordsize %d> }",
-				personality_wordsize[current_personality]);
+				current_wordsize);
 			return;
 		}
 	} else
 #endif
 	{
 		if (umove(tcp, addr, &fl) < 0) {
-			tprintf("{...}");
+			tprints("{...}");
 			return;
 		}
 	}
-	tprintf("{type=");
+	tprints("{type=");
 	printxval(lockfcmds, fl.l_type, "F_???");
-	tprintf(", whence=");
+	tprints(", whence=");
 	printxval(whence, fl.l_whence, "SEEK_???");
 	tprintf(", start=%ld, len=%ld", fl.l_start, fl.l_len);
 	if (getlk)
 		tprintf(", pid=%lu}", (unsigned long) fl.l_pid);
 	else
-		tprintf("}");
+		tprints("}");
 }
 #endif

@ -290,18 +283,18 @@ printflock64(struct tcb *tcp, long addr, int getlk)
 	struct flock64 fl;

 	if (umove(tcp, addr, &fl) < 0) {
-		tprintf("{...}");
+		tprints("{...}");
 		return;
 	}
-	tprintf("{type=");
+	tprints("{type=");
 	printxval(lockfcmds, fl.l_type, "F_???");
-	tprintf(", whence=");
+	tprints(", whence=");
 	printxval(whence, fl.l_whence, "SEEK_???");
 	tprintf(", start=%lld, len=%lld", (long long) fl.l_start, (long long) fl.l_len);
 	if (getlk)
 		tprintf(", pid=%lu}", (unsigned long) fl.l_pid);
 	else
-		tprintf("}");
+		tprints("}");
 }
 #endif

@ -309,11 +302,12 @@ int
 sys_fcntl(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		tprintf("%ld, ", tcp->u_arg[0]);
+		printfd(tcp, tcp->u_arg[0]);
+		tprints(", ");
 		printxval(fcntlcmds, tcp->u_arg[1], "F_???");
 		switch (tcp->u_arg[1]) {
 		case F_SETFD:
-			tprintf(", ");
+			tprints(", ");
 			printflags(fdflags, tcp->u_arg[2], "FD_???");
 			break;
 		case F_SETOWN: case F_DUPFD:
@ -323,14 +317,14 @@ sys_fcntl(struct tcb *tcp)
 			tprintf(", %ld", tcp->u_arg[2]);
 			break;
 		case F_SETFL:
-			tprintf(", ");
+			tprints(", ");
 			tprint_open_modes(tcp->u_arg[2]);
 			break;
 		case F_SETLK: case F_SETLKW:
 #ifdef F_FREESP
 		case F_FREESP:
 #endif
-			tprintf(", ");
+			tprints(", ");
 			printflock(tcp, tcp->u_arg[2], 0);
 			break;
 #if _LFS64_LARGEFILE
@ -345,19 +339,19 @@ sys_fcntl(struct tcb *tcp)
 #if defined(F_SETLKW64) && F_SETLKW64 + 0 != F_SETLKW
 		case F_SETLKW64:
 #endif
-			tprintf(", ");
+			tprints(", ");
 			printflock64(tcp, tcp->u_arg[2], 0);
 			break;
 #endif
 #ifdef F_NOTIFY
 		case F_NOTIFY:
-			tprintf(", ");
+			tprints(", ");
 			printflags(notifyflags, tcp->u_arg[2], "DN_???");
 			break;
 #endif
 #ifdef F_SETLEASE
 		case F_SETLEASE:
-			tprintf(", ");
+			tprints(", ");
 			printxval(lockfcmds, tcp->u_arg[2], "F_???");
 			break;
 #endif
@ -390,14 +384,14 @@ sys_fcntl(struct tcb *tcp)
 			tcp->auxstr = sprint_open_modes(tcp->u_rval);
 			return RVAL_HEX|RVAL_STR;
 		case F_GETLK:
-			tprintf(", ");
+			tprints(", ");
 			printflock(tcp, tcp->u_arg[2], 1);
 			break;
 #if _LFS64_LARGEFILE
-#if defined(F_GETLK64) && F_GETLK64+0!=F_GETLK
+#if defined(F_GETLK64) && F_GETLK64+0 != F_GETLK
 		case F_GETLK64:
 #endif
-			tprintf(", ");
+			tprints(", ");
 			printflock64(tcp, tcp->u_arg[2], 1);
 			break;
 #endif
@ -422,7 +416,8 @@ int
 sys_flock(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		tprintf("%ld, ", tcp->u_arg[0]);
+		printfd(tcp, tcp->u_arg[0]);
+		tprints(", ");
 		printflags(flockcmds, tcp->u_arg[1], "LOCK_???");
 	}
 	return 0;
@ -433,16 +428,7 @@ int
 sys_close(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		tprintf("%ld", tcp->u_arg[0]);
-	}
-	return 0;
-}
-
-int
-sys_dup(struct tcb *tcp)
-{
-	if (entering(tcp)) {
-		tprintf("%ld", tcp->u_arg[0]);
+		printfd(tcp, tcp->u_arg[0]);
 	}
 	return 0;
 }
@ -451,9 +437,11 @@ static int
 do_dup2(struct tcb *tcp, int flags_arg)
 {
 	if (entering(tcp)) {
-		tprintf("%ld, %ld", tcp->u_arg[0], tcp->u_arg[1]);
+		printfd(tcp, tcp->u_arg[0]);
+		tprints(", ");
+		printfd(tcp, tcp->u_arg[1]);
 		if (flags_arg >= 0) {
-			tprintf(", ");
+			tprints(", ");
 			printflags(open_mode_flags, tcp->u_arg[flags_arg], "O_???");
 		}
 	}
@ -466,142 +454,146 @@ sys_dup2(struct tcb *tcp)
 	return do_dup2(tcp, -1);
 }

-#ifdef LINUX
 int
 sys_dup3(struct tcb *tcp)
 {
 	return do_dup2(tcp, 2);
 }
-#endif

-#if defined(ALPHA) || defined(FREEBSD) || defined(SUNOS4)
+#if defined(ALPHA)
 int
 sys_getdtablesize(struct tcb *tcp)
 {
 	return 0;
 }
-#endif /* ALPHA || FREEBSD || SUNOS4 */
+#endif

 static int
 decode_select(struct tcb *tcp, long *args, enum bitness_t bitness)
 {
-	int i, j, nfds;
-	unsigned int fdsize = ((((args[0] + 7) / 8) + sizeof(long) - 1)
-			       & -sizeof(long));
+	int i, j;
+	unsigned nfds, fdsize;
 	fd_set *fds;
-	static char outstr[1024];
-	char *sep;
+	const char *sep;
 	long arg;

+	fdsize = args[0];
+	/* Beware of select(2^31-1, NULL, NULL, NULL) and similar... */
+	if (args[0] > 1024*1024)
+		fdsize = 1024*1024;
+	if (args[0] < 0)
+		fdsize = 0;
+	fdsize = (((fdsize + 7) / 8) + sizeof(long)-1) & -sizeof(long);
+
 	if (entering(tcp)) {
-		fds = (fd_set *) malloc(fdsize);
-		if (fds == NULL)
-			fprintf(stderr, "out of memory\n");
+		fds = malloc(fdsize);
+		if (!fds)
+			die_out_of_memory();
 		nfds = args[0];
 		tprintf("%d", nfds);
 		for (i = 0; i < 3; i++) {
 			arg = args[i+1];
 			if (arg == 0) {
-				tprintf(", NULL");
+				tprints(", NULL");
 				continue;
 			}
-			if (fds == NULL || !verbose(tcp)) {
+			if (!verbose(tcp)) {
 				tprintf(", %#lx", arg);
 				continue;
 			}
 			if (umoven(tcp, arg, fdsize, (char *) fds) < 0) {
-				tprintf(", [?]");
+				tprints(", [?]");
 				continue;
 			}
-			tprintf(", [");
+			tprints(", [");
 			for (j = 0, sep = ""; j < nfds; j++) {
 				if (FD_ISSET(j, fds)) {
-					tprintf("%s%u", sep, j);
+					tprints(sep);
+					printfd(tcp, j);
 					sep = " ";
 				}
 			}
-			tprintf("]");
+			tprints("]");
 		}
 		free(fds);
-		tprintf(", ");
+		tprints(", ");
 		printtv_bitness(tcp, args[4], bitness, 0);
 	}
-	else
-	{
-		unsigned int cumlen = 0;
-		char *sep = "";
+	else {
+		static char outstr[1024];
+		char *outptr;
+#define end_outstr (outstr + sizeof(outstr))
+		const char *sep;

 		if (syserror(tcp))
 			return 0;

-		if ((nfds = tcp->u_rval) == 0) {
+		nfds = tcp->u_rval;
+		if (nfds == 0) {
 			tcp->auxstr = "Timeout";
 			return RVAL_STR;
 		}

-		fds = (fd_set *) malloc(fdsize);
-		if (fds == NULL)
-			fprintf(stderr, "out of memory\n");
+		fds = malloc(fdsize);
+		if (!fds)
+			die_out_of_memory();

-		outstr[0] = '\0';
+		outptr = outstr;
+		sep = "";
 		for (i = 0; i < 3; i++) {
 			int first = 1;
-			char str[20];

-			tcp->auxstr = outstr;
 			arg = args[i+1];
-			if (fds == NULL || !arg ||
-			    umoven(tcp, arg, fdsize, (char *) fds) < 0)
+			if (!arg || umoven(tcp, arg, fdsize, (char *) fds) < 0)
 				continue;
 			for (j = 0; j < args[0]; j++) {
 				if (FD_ISSET(j, fds)) {
-					if (first) {
-						sprintf(str, "%s%s [%u", sep,
-							i == 0 ? "in" :
-							i == 1 ? "out" :
-							"except", j);
-						first = 0;
-						sep = ", ";
+					/* +2 chars needed at the end: ']',NUL */
+					if (outptr < end_outstr - (sizeof(", except [") + sizeof(int)*3 + 2)) {
+						if (first) {
+							outptr += sprintf(outptr, "%s%s [%u",
+								sep,
+								i == 0 ? "in" : i == 1 ? "out" : "except",
+								j
+							);
+							first = 0;
+							sep = ", ";
+						}
+						else {
+							outptr += sprintf(outptr, " %u", j);
+						}
 					}
-					else
-						sprintf(str, " %u", j);
-					cumlen += strlen(str);
-					if (cumlen < sizeof(outstr))
-						strcat(outstr, str);
 					nfds--;
 				}
 			}
-			if (cumlen)
-				strcat(outstr, "]");
+			if (outptr != outstr)
+				*outptr++ = ']';
 			if (nfds == 0)
 				break;
 		}
 		free(fds);
-#ifdef LINUX
 		/* This contains no useful information on SunOS.  */
 		if (args[4]) {
-			char str[128];
-
-			sprintf(str, "%sleft ", sep);
-			sprinttv(tcp, args[4], bitness, str + strlen(str));
-			if ((cumlen += strlen(str)) < sizeof(outstr))
-				strcat(outstr, str);
+			if (outptr < end_outstr - (10 + TIMEVAL_TEXT_BUFSIZE)) {
+				outptr += sprintf(outptr, "%sleft ", sep);
+				outptr = sprinttv(outptr, tcp, args[4], bitness, /*special:*/ 0);
+			}
 		}
-#endif /* LINUX */
+		*outptr = '\0';
+		tcp->auxstr = outstr;
 		return RVAL_STR;
+#undef end_outstr
 	}
 	return 0;
 }

-#ifdef LINUX
-
 int
 sys_oldselect(struct tcb *tcp)
 {
 	long args[5];

 	if (umoven(tcp, tcp->u_arg[0], sizeof args, (char *) args) < 0) {
-		tprintf("[...]");
+		tprints("[...]");
 		return 0;
 	}
 	return decode_select(tcp, args, BITNESS_CURRENT);
@ -660,6 +652,9 @@ static const struct xlat epollevents[] = {
 #ifdef EPOLLHUP
 	{ EPOLLHUP,	"EPOLLHUP"	},
 #endif
+#ifdef EPOLLRDHUP
+	{ EPOLLRDHUP,	"EPOLLRDHUP"	},
+#endif
 #ifdef EPOLLONESHOT
 	{ EPOLLONESHOT,	"EPOLLONESHOT"	},
 #endif
@ -669,19 +664,28 @@ static const struct xlat epollevents[] = {
 	{ 0,		NULL		}
 };

+/* Not aliased to printargs_ld: we want it to have a distinct address */
 int
 sys_epoll_create(struct tcb *tcp)
 {
-	if (entering(tcp))
-		tprintf("%ld", tcp->u_arg[0]);
-	return 0;
+	return printargs_ld(tcp);
 }

+static const struct xlat epollflags[] = {
+#ifdef EPOLL_CLOEXEC
+	{ EPOLL_CLOEXEC,	"EPOLL_CLOEXEC"	},
+#endif
+#ifdef EPOLL_NONBLOCK
+	{ EPOLL_NONBLOCK,	"EPOLL_NONBLOCK"	},
+#endif
+	{ 0,		NULL		}
+};
+
 int
 sys_epoll_create1(struct tcb *tcp)
 {
 	if (entering(tcp))
-		printflags(open_mode_flags, tcp->u_arg[0], "O_???");
+		printflags(epollflags, tcp->u_arg[0], "EPOLL_???");
 	return 0;
 }

@ -689,7 +693,7 @@ sys_epoll_create1(struct tcb *tcp)
 static void
 print_epoll_event(struct epoll_event *ev)
 {
-	tprintf("{");
+	tprints("{");
 	printflags(epollevents, ev->events, "EPOLL???");
 	/* We cannot know what format the program uses, so print u32 and u64
 	   which will cover every value.  */
@ -702,11 +706,14 @@ int
 sys_epoll_ctl(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		tprintf("%ld, ", tcp->u_arg[0]);
+		printfd(tcp, tcp->u_arg[0]);
+		tprints(", ");
 		printxval(epollctls, tcp->u_arg[1], "EPOLL_CTL_???");
-		tprintf(", %ld, ", tcp->u_arg[2]);
+		tprints(", ");
+		printfd(tcp, tcp->u_arg[2]);
+		tprints(", ");
 		if (tcp->u_arg[3] == 0)
-			tprintf("NULL");
+			tprints("NULL");
 		else {
 #ifdef HAVE_SYS_EPOLL_H
 			struct epoll_event ev;
@ -714,7 +721,7 @@ sys_epoll_ctl(struct tcb *tcp)
 				print_epoll_event(&ev);
 			else
 #endif
-				tprintf("{...}");
+				tprints("{...}");
 		}
 	}
 	return 0;
@ -723,40 +730,41 @@ sys_epoll_ctl(struct tcb *tcp)
 static void
 epoll_wait_common(struct tcb *tcp)
 {
-	if (entering(tcp))
-		tprintf("%ld, ", tcp->u_arg[0]);
-	else {
+	if (entering(tcp)) {
+		printfd(tcp, tcp->u_arg[0]);
+		tprints(", ");
+	} else {
 		if (syserror(tcp))
 			tprintf("%lx", tcp->u_arg[1]);
 		else if (tcp->u_rval == 0)
-			tprintf("{}");
+			tprints("{}");
 		else {
 #ifdef HAVE_SYS_EPOLL_H
 			struct epoll_event ev, *start, *cur, *end;
 			int failed = 0;

-			tprintf("{");
+			tprints("{");
 			start = (struct epoll_event *) tcp->u_arg[1];
 			end = start + tcp->u_rval;
 			for (cur = start; cur < end; ++cur) {
 				if (cur > start)
-					tprintf(", ");
+					tprints(", ");
 				if (umove(tcp, (long) cur, &ev) == 0)
 					print_epoll_event(&ev);
 				else {
-					tprintf("?");
+					tprints("?");
 					failed = 1;
 					break;
 				}
 			}
-			tprintf("}");
+			tprints("}");
 			if (failed)
 				tprintf(" %#lx", (long) start);
 #else
-			tprintf("{...}");
+			tprints("{...}");
 #endif
 		}
-		tprintf(", %ld, %ld", tcp->u_arg[2], tcp->u_arg[3]);
+		tprintf(", %d, %d", (int) tcp->u_arg[2], (int) tcp->u_arg[3]);
 	}
 }

@ -771,8 +779,10 @@ int
 sys_epoll_pwait(struct tcb *tcp)
 {
 	epoll_wait_common(tcp);
-	if (exiting(tcp))
+	if (exiting(tcp)) {
+		tprints(", ");
 		print_sigset(tcp, tcp->u_arg[4], 0);
+	}
 	return 0;
 }

@ -789,7 +799,7 @@ sys_io_setup(struct tcb *tcp)
 			if (umove(tcp, tcp->u_arg[1], &user_id) == 0)
 				tprintf("{%lu}", user_id);
 			else
-				tprintf("{...}");
+				tprints("{...}");
 		}
 	}
 	return 0;
@ -803,6 +813,56 @@ sys_io_destroy(struct tcb *tcp)
 	return 0;
 }

+#ifdef HAVE_LIBAIO_H
+
+enum iocb_sub {
+	SUB_NONE, SUB_COMMON, SUB_POLL, SUB_VECTOR
+};
+
+static const char *
+iocb_cmd_lookup(unsigned cmd, enum iocb_sub *sub)
+{
+	static char buf[sizeof("%u /* SUB_??? */") + sizeof(int)*3];
+	static const struct {
+		const char *name;
+		enum iocb_sub sub;
+	} cmds[] = {
+		{ "pread", SUB_COMMON },
+		{ "pwrite", SUB_COMMON },
+		{ "fsync", SUB_NONE },
+		{ "fdsync", SUB_NONE },
+		{ "op4", SUB_NONE },
+		{ "poll", SUB_POLL },
+		{ "noop", SUB_NONE },
+		{ "preadv", SUB_VECTOR },
+		{ "pwritev", SUB_VECTOR },
+	};
+
+	if (cmd < ARRAY_SIZE(cmds)) {
+		*sub = cmds[cmd].sub;
+		return cmds[cmd].name;
+	}
+	*sub = SUB_NONE;
+	sprintf(buf, "%u /* SUB_??? */", cmd);
+	return buf;
+}
+
+/* Not defined in libaio.h */
+#ifndef IOCB_RESFD
+# define IOCB_RESFD (1 << 0)
+#endif
+
+static void
+print_common_flags(struct iocb *iocb)
+{
+	if (iocb->u.c.flags & IOCB_RESFD)
+		tprintf("resfd=%d, ", iocb->u.c.resfd);
+	if (iocb->u.c.flags & ~IOCB_RESFD)
+		tprintf("flags=%x, ", iocb->u.c.flags);
+}
+
+#endif /* HAVE_LIBAIO_H */
+
 int
 sys_io_submit(struct tcb *tcp)
 {
@ -812,33 +872,68 @@ sys_io_submit(struct tcb *tcp)
 		nr = tcp->u_arg[1];
 		/* and if nr is negative? */
 		if (nr == 0)
-			tprintf("{}");
+			tprints("{}");
 		else {
 #ifdef HAVE_LIBAIO_H
 			long i;
 			struct iocb *iocbp, **iocbs = (void *)tcp->u_arg[2];

 			for (i = 0; i < nr; i++, iocbs++) {
+				enum iocb_sub sub;
 				struct iocb iocb;
 				if (i == 0)
-					tprintf("{");
+					tprints("{");
 				else
-					tprintf(", ");
+					tprints(", ");

 				if (umove(tcp, (unsigned long)iocbs, &iocbp) ||
 				    umove(tcp, (unsigned long)iocbp, &iocb)) {
-					tprintf("{...}");
+					tprints("{...}");
 					continue;
 				}
-				tprintf("{%p, %u, %hu, %hu, %d}",
-					iocb.data, iocb.key,
-					iocb.aio_lio_opcode,
-					iocb.aio_reqprio, iocb.aio_fildes);
+				tprints("{");
+				if (iocb.data)
+					tprintf("data:%p, ", iocb.data);
+				if (iocb.key)
+					tprintf("key:%u, ", iocb.key);
+				tprintf("%s, ", iocb_cmd_lookup(iocb.aio_lio_opcode, &sub));
+				if (iocb.aio_reqprio)
+					tprintf("reqprio:%d, ", iocb.aio_reqprio);
+				tprintf("filedes:%d", iocb.aio_fildes);
+				switch (sub) {
+				case SUB_COMMON:
+					if (iocb.aio_lio_opcode == IO_CMD_PWRITE) {
+						tprints(", str:");
+						printstr(tcp, (unsigned long)iocb.u.c.buf,
+							 iocb.u.c.nbytes);
+					} else {
+						tprintf(", buf:%p", iocb.u.c.buf);
+					}
+					tprintf(", nbytes:%lu, offset:%llx",
+						iocb.u.c.nbytes,
+						iocb.u.c.offset);
+					print_common_flags(&iocb);
+					break;
+				case SUB_VECTOR:
+					tprintf(", %llx, ", iocb.u.v.offset);
+					print_common_flags(&iocb);
+					tprint_iov(tcp, iocb.u.v.nr,
+						   (unsigned long)iocb.u.v.vec,
+						   iocb.aio_lio_opcode == IO_CMD_PWRITEV);
+					break;
+				case SUB_POLL:
+					tprintf(", %x", iocb.u.poll.events);
+					break;
+				case SUB_NONE:
+				        break;
+				}
+				tprints("}");
 			}
 			if (i)
-				tprintf("}");
+				tprints("}");
 #else
-			tprintf("{...}");
+#warning "libaio-devel is not available => no io_submit decoding"
+			tprintf("%#lx", tcp->u_arg[2]);
 #endif
 		}
 	}
@ -855,16 +950,16 @@ sys_io_cancel(struct tcb *tcp)
 		tprintf("%lu, ", tcp->u_arg[0]);
 #ifdef HAVE_LIBAIO_H
 		if (umove(tcp, tcp->u_arg[1], &iocb) == 0) {
-			tprintf("{%p, %u, %hu, %hu, %d}, ",
+			tprintf("{%p, %u, %u, %u, %d}, ",
 				iocb.data, iocb.key,
-				iocb.aio_lio_opcode,
-				iocb.aio_reqprio, iocb.aio_fildes);
+				(unsigned)iocb.aio_lio_opcode,
+				(unsigned)iocb.aio_reqprio, iocb.aio_fildes);
 		} else
 #endif
-			tprintf("{...}, ");
+			tprints("{...}, ");
 	} else {
 		if (tcp->u_rval < 0)
-			tprintf("{...}");
+			tprints("{...}");
 		else {
 #ifdef HAVE_LIBAIO_H
 			struct io_event event;
@ -874,7 +969,7 @@ sys_io_cancel(struct tcb *tcp)
 					event.res, event.res2);
 			else
 #endif
-				tprintf("{...}");
+				tprints("{...}");
 		}
 	}
 	return 0;
@ -888,8 +983,8 @@ sys_io_getevents(struct tcb *tcp)
 			tcp->u_arg[2]);
 	} else {
 		if (tcp->u_rval == 0) {
-			tprintf("{}");
-		} else  {
+			tprints("{}");
+		} else {
 #ifdef HAVE_LIBAIO_H
 			struct io_event *events = (void *)tcp->u_arg[3];
 			long i, nr = tcp->u_rval;
@ -898,20 +993,20 @@ sys_io_getevents(struct tcb *tcp)
 				struct io_event event;

 				if (i == 0)
-					tprintf("{");
+					tprints("{");
 				else
-					tprintf(", ");
+					tprints(", ");

 				if (umove(tcp, (unsigned long)events, &event) != 0) {
-					tprintf("{...}");
+					tprints("{...}");
 					continue;
 				}
 				tprintf("{%p, %p, %ld, %ld}", event.data,
 					event.obj, event.res, event.res2);
 			}
-			tprintf("}, ");
+			tprints("}, ");
 #else
-				tprintf("{...}");
+			tprints("{...}");
 #endif
 		}

@ -919,7 +1014,6 @@ sys_io_getevents(struct tcb *tcp)
 	}
 	return 0;
 }
-#endif /* LINUX */

 int
 sys_select(struct tcb *tcp)
@ -927,7 +1021,6 @@ sys_select(struct tcb *tcp)
 	return decode_select(tcp, tcp->u_arg, BITNESS_CURRENT);
 }

-#ifdef LINUX
 int
 sys_pselect6(struct tcb *tcp)
 {
@ -940,7 +1033,7 @@ sys_pselect6(struct tcb *tcp)
 		if (umove(tcp, tcp->u_arg[5], &data) < 0)
 			tprintf(", %#lx", tcp->u_arg[5]);
 		else {
-			tprintf(", {");
+			tprints(", {");
 			if (data.len < sizeof(long))
 				tprintf("%#lx", (long)data.ss);
 			else
@ -957,7 +1050,7 @@ do_eventfd(struct tcb *tcp, int flags_arg)
 	if (entering(tcp)) {
 		tprintf("%lu", tcp->u_arg[0]);
 		if (flags_arg >= 0) {
-			tprintf(", ");
+			tprints(", ");
 			printflags(open_mode_flags, tcp->u_arg[flags_arg], "O_???");
 		}
 	}
@ -975,4 +1068,3 @@ sys_eventfd2(struct tcb *tcp)
 {
 	return do_eventfd(tcp, 1);
 }
-#endif
--- a/errnoent.sh
+++ b/errnoent.sh
@ -23,8 +23,6 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-#	$Id$

 awk '
 /^#define[ 	]+E[A-Z0-9_]+[ 	]+[0-9]+/ {
--- a/file.c
+++ b/file.c
--- a/freebsd/.cvsignore
+++ b/freebsd/.cvsignore
@ -1 +0,0 @@
-Makefile
--- a/freebsd/i386/.cvsignore
+++ b/freebsd/i386/.cvsignore
@ -1 +0,0 @@
-Makefile
--- a/freebsd/i386/Makefile.am
+++ b/freebsd/i386/Makefile.am
@ -1,24 +0,0 @@
-# Automake input for freebsd/i386/ subdirectory of strace.
-
-noinst_HEADERS = errnoent.h ioctlent.h signalent.h syscallent.h syscall.h
-BUILT_SOURCES = $(noinst_HEADERS)
-
-
-ioctlent.raw: $(srcdir)/../ioctlent.sh
-	$(SHELL) $(srcdir)/../ioctlent.sh $(includedir) >$@
-
-ioctlent.h: ioctlent.raw ioctlsort
-	./ioctlsort >$@
-
-ioctlsort.o: $(srcdir)/../../ioctlsort.c
-
-ioctlsort.o: ioctlent.raw
-
-errnoent.h: $(srcdir)/../../errnoent.sh $(includedir)/errno.h
-	$(SHELL) $(srcdir)/../../errnoent.sh $(includedir)/errno.h >$@
-
-signalent.h: $(srcdir)/../../signalent.sh $(includedir)/sys/signal.h
-	$(SHELL) $(srcdir)/../../signalent.sh $(includedir)/sys/signal.h >$@
-
-syscallent.h: $(srcdir)/../syscalls.pl $(srcdir)/../syscalls.cat $(srcdir)/../syscalls.print /usr/src/sys/kern/syscalls.master
-	$(PERL) $(srcdir)/../syscalls.pl /usr/src/sys/kern/syscalls.master $(srcdir)/../syscalls.print $(srcdir)/../syscalls.cat >$@
--- a/freebsd/i386/errnoent.h
+++ b/freebsd/i386/errnoent.h
@ -1,87 +0,0 @@
-	"ERRNO_0", /* 0 */
-	"EPERM", /* 1 */
-	"ENOENT", /* 2 */
-	"ESRCH", /* 3 */
-	"EINTR", /* 4 */
-	"EIO", /* 5 */
-	"ENXIO", /* 6 */
-	"E2BIG", /* 7 */
-	"ENOEXEC", /* 8 */
-	"EBADF", /* 9 */
-	"ECHILD", /* 10 */
-	"EDEADLK", /* 11 */
-	"ENOMEM", /* 12 */
-	"EACCES", /* 13 */
-	"EFAULT", /* 14 */
-	"ENOTBLK", /* 15 */
-	"EBUSY", /* 16 */
-	"EEXIST", /* 17 */
-	"EXDEV", /* 18 */
-	"ENODEV", /* 19 */
-	"ENOTDIR", /* 20 */
-	"EISDIR", /* 21 */
-	"EINVAL", /* 22 */
-	"ENFILE", /* 23 */
-	"EMFILE", /* 24 */
-	"ENOTTY", /* 25 */
-	"ETXTBSY", /* 26 */
-	"EFBIG", /* 27 */
-	"ENOSPC", /* 28 */
-	"ESPIPE", /* 29 */
-	"EROFS", /* 30 */
-	"EMLINK", /* 31 */
-	"EPIPE", /* 32 */
-	"EDOM", /* 33 */
-	"ERANGE", /* 34 */
-	"EAGAIN", /* 35 */
-	"EINPROGRESS", /* 36 */
-	"EALREADY", /* 37 */
-	"ENOTSOCK", /* 38 */
-	"EDESTADDRREQ", /* 39 */
-	"EMSGSIZE", /* 40 */
-	"EPROTOTYPE", /* 41 */
-	"ENOPROTOOPT", /* 42 */
-	"EPROTONOSUPPORT", /* 43 */
-	"ESOCKTNOSUPPORT", /* 44 */
-	"EOPNOTSUPP", /* 45 */
-	"EPFNOSUPPORT", /* 46 */
-	"EAFNOSUPPORT", /* 47 */
-	"EADDRINUSE", /* 48 */
-	"EADDRNOTAVAIL", /* 49 */
-	"ENETDOWN", /* 50 */
-	"ENETUNREACH", /* 51 */
-	"ENETRESET", /* 52 */
-	"ECONNABORTED", /* 53 */
-	"ECONNRESET", /* 54 */
-	"ENOBUFS", /* 55 */
-	"EISCONN", /* 56 */
-	"ENOTCONN", /* 57 */
-	"ESHUTDOWN", /* 58 */
-	"ETOOMANYREFS", /* 59 */
-	"ETIMEDOUT", /* 60 */
-	"ECONNREFUSED", /* 61 */
-	"ELOOP", /* 62 */
-	"ENAMETOOLONG", /* 63 */
-	"EHOSTDOWN", /* 64 */
-	"EHOSTUNREACH", /* 65 */
-	"ENOTEMPTY", /* 66 */
-	"EPROCLIM", /* 67 */
-	"EUSERS", /* 68 */
-	"EDQUOT", /* 69 */
-	"ESTALE", /* 70 */
-	"EREMOTE", /* 71 */
-	"EBADRPC", /* 72 */
-	"ERPCMISMATCH", /* 73 */
-	"EPROGUNAVAIL", /* 74 */
-	"EPROGMISMATCH", /* 75 */
-	"EPROCUNAVAIL", /* 76 */
-	"ENOLCK", /* 77 */
-	"ENOSYS", /* 78 */
-	"EFTYPE", /* 79 */
-	"EAUTH", /* 80 */
-	"ENEEDAUTH", /* 81 */
-	"EIDRM", /* 82 */
-	"ENOMSG", /* 83 */
-	"EOVERFLOW", /* 84 */
-	"ECANCELED", /* 85 */
-	"ELAST", /* 86 */
--- a/freebsd/i386/ioctlent.h
+++ b/freebsd/i386/ioctlent.h
--- a/freebsd/i386/signalent.h
+++ b/freebsd/i386/signalent.h
@ -1,32 +0,0 @@
-	"SIG_0",	/* 0 */
-	"SIGHUP",	/* 1 */
-	"SIGINT",	/* 2 */
-	"SIGQUIT",	/* 3 */
-	"SIGILL",	/* 4 */
-	"SIGTRAP",	/* 5 */
-	"SIGABRT",	/* 6 */
-	"SIGEMT",	/* 7 */
-	"SIGFPE",	/* 8 */
-	"SIGKILL",	/* 9 */
-	"SIGBUS",	/* 10 */
-	"SIGSEGV",	/* 11 */
-	"SIGSYS",	/* 12 */
-	"SIGPIPE",	/* 13 */
-	"SIGALRM",	/* 14 */
-	"SIGTERM",	/* 15 */
-	"SIGURG",	/* 16 */
-	"SIGSTOP",	/* 17 */
-	"SIGTSTP",	/* 18 */
-	"SIGCONT",	/* 19 */
-	"SIGCHLD",	/* 20 */
-	"SIGTTIN",	/* 21 */
-	"SIGTTOU",	/* 22 */
-	"SIGIO",	/* 23 */
-	"SIGXCPU",	/* 24 */
-	"SIGXFSZ",	/* 25 */
-	"SIGVTALRM",	/* 26 */
-	"SIGPROF",	/* 27 */
-	"SIGWINCH",	/* 28 */
-	"SIGINFO",	/* 29 */
-	"SIGUSR1",	/* 30 */
-	"SIGUSR2",	/* 31 */
--- a/freebsd/i386/syscall.h
+++ b/freebsd/i386/syscall.h
@ -1,274 +0,0 @@
-/*
- * Automatically generated by ./../syscalls.pl on Thu Mar  8 18:14:07 2001
- */
-
-#define sys_syscall printargs
-int sys_exit();
-int sys_fork();
-int sys_read();
-int sys_write();
-int sys_open();
-int sys_close();
-int sys_wait4();
-int sys_creat();
-int sys_link();
-int sys_unlink();
-int sys_chdir();
-int sys_fchdir();
-int sys_mknod();
-int sys_chmod();
-int sys_chown();
-#define sys_break printargs
-#define sys_getfsstat printargs
-int sys_lseek();
-int sys_getpid();
-#define sys_mount printargs
-#define sys_unmount printargs
-#define sys_setuid printargs
-int sys_getuid();
-#define sys_geteuid printargs
-int sys_ptrace();
-int sys_recvmsg();
-int sys_sendmsg();
-int sys_recvfrom();
-int sys_accept();
-int sys_getpeername();
-int sys_getsockname();
-int sys_access();
-int sys_chflags();
-int sys_fchflags();
-#define sys_sync printargs
-int sys_kill();
-int sys_stat();
-#define sys_getppid printargs
-int sys_lstat();
-int sys_dup();
-int sys_pipe();
-#define sys_getegid printargs
-#define sys_profil printargs
-#define sys_ktrace printargs
-int sys_sigaction();
-int sys_getgid();
-int sys_sigprocmask();
-#define sys_getlogin printargs
-#define sys_setlogin printargs
-#define sys_acct printargs
-int sys_sigpending();
-int sys_sigaltstack();
-int sys_ioctl();
-#define sys_reboot printargs
-#define sys_revoke printargs
-int sys_symlink();
-int sys_readlink();
-int sys_execve();
-int sys_umask();
-int sys_chroot();
-int sys_fstat();
-#define sys_getkerninfo printargs
-int sys_getpagesize();
-int sys_msync();
-int sys_vfork();
-int sys_sbrk();
-#define sys_sstk printargs
-int sys_mmap();
-#define sys_vadvise printargs
-int sys_munmap();
-int sys_mprotect();
-#define sys_madvise printargs
-int sys_mincore();
-int sys_getgroups();
-int sys_setgroups();
-int sys_getpgrp();
-int sys_setpgid();
-int sys_setitimer();
-int sys_wait();
-#define sys_swapon printargs
-int sys_getitimer();
-int sys_gethostname();
-int sys_sethostname();
-int sys_getdtablesize();
-int sys_dup2();
-int sys_fcntl();
-int sys_select();
-int sys_fsync();
-int sys_setpriority();
-int sys_socket();
-int sys_connect();
-int sys_accept();
-int sys_getpriority();
-int sys_send();
-int sys_recv();
-#define sys_sigreturn printargs
-int sys_bind();
-int sys_setsockopt();
-int sys_listen();
-int sys_sigvec();
-int sys_sigblock();
-int sys_sigsetmask();
-int sys_sigsuspend();
-int sys_sigstack();
-int sys_recvmsg();
-int sys_sendmsg();
-int sys_gettimeofday();
-int sys_getrusage();
-int sys_getsockopt();
-int sys_readv();
-int sys_writev();
-int sys_settimeofday();
-int sys_fchown();
-int sys_fchmod();
-int sys_recvfrom();
-int sys_setreuid();
-int sys_setregid();
-int sys_rename();
-int sys_truncate();
-int sys_ftruncate();
-int sys_flock();
-int sys_mkfifo();
-int sys_sendto();
-int sys_shutdown();
-int sys_socketpair();
-int sys_mkdir();
-int sys_rmdir();
-int sys_utimes();
-int sys_adjtime();
-int sys_getpeername();
-int sys_gethostid();
-#define sys_sethostid printargs
-int sys_getrlimit();
-int sys_setrlimit();
-int sys_killpg();
-int sys_setsid();
-int sys_quotactl();
-#define sys_quota printargs
-int sys_getsockname();
-#define sys_nfssvc printargs
-int sys_getdirentries();
-int sys_statfs();
-int sys_fstatfs();
-#define sys_getfh printargs
-int sys_getdomainname();
-int sys_setdomainname();
-int sys_uname();
-#define sys_sysarch printargs
-#define sys_rtprio printargs
-#define sys_semsys printargs
-#define sys_msgsys printargs
-#define sys_shmsys printargs
-int sys_pread();
-int sys_pwrite();
-#define sys_ntp_adjtime printargs
-#define sys_setgid printargs
-#define sys_setegid printargs
-#define sys_seteuid printargs
-int sys_stat();
-int sys_fstat();
-int sys_lstat();
-int sys_pathconf();
-int sys_fpathconf();
-int sys_getrlimit();
-int sys_setrlimit();
-int sys_getdirentries();
-int sys_mmap();
-#define sys___syscall printargs
-int sys_lseek();
-int sys_truncate();
-int sys_ftruncate();
-int sys___sysctl();
-#define sys_mlock printargs
-#define sys_munlock printargs
-#define sys_undelete printargs
-#define sys_futimes printargs
-int sys_getpgid();
-int sys_poll();
-#define sys___semctl printargs
-int sys_semget();
-int sys_semop();
-int sys_msgctl();
-int sys_msgget();
-int sys_msgsnd();
-int sys_msgrcv();
-int sys_shmat();
-int sys_shmctl();
-int sys_shmdt();
-int sys_shmget();
-#define sys_clock_gettime printargs
-#define sys_clock_settime printargs
-#define sys_clock_getres printargs
-#define sys_nanosleep printargs
-#define sys_minherit printargs
-#define sys_rfork printargs
-#define sys_openbsd_poll printargs
-#define sys_issetugid printargs
-#define sys_lchown printargs
-int sys_getdents();
-#define sys_lchmod printargs
-#define sys_netbsd_lchown printargs
-#define sys_lutimes printargs
-#define sys_netbsd_msync printargs
-#define sys_nstat printargs
-#define sys_nfstat printargs
-#define sys_nlstat printargs
-#define sys_fhstatfs printargs
-#define sys_fhopen printargs
-#define sys_fhstat printargs
-#define sys_modnext printargs
-#define sys_modstat printargs
-#define sys_modfnext printargs
-#define sys_modfind printargs
-#define sys_kldload printargs
-#define sys_kldunload printargs
-#define sys_kldfind printargs
-#define sys_kldnext printargs
-#define sys_kldstat printargs
-#define sys_kldfirstmod printargs
-int sys_getsid();
-int sys_setresuid();
-int sys_setresgid();
-#define sys_aio_return printargs
-#define sys_aio_suspend printargs
-#define sys_aio_cancel printargs
-#define sys_aio_error printargs
-#define sys_aio_read printargs
-#define sys_aio_write printargs
-#define sys_lio_listio printargs
-#define sys_yield printargs
-#define sys_thr_sleep printargs
-#define sys_thr_wakeup printargs
-#define sys_mlockall printargs
-#define sys_munlockall printargs
-int sys___getcwd();
-#define sys_sched_setparam printargs
-#define sys_sched_getparam printargs
-#define sys_sched_setscheduler printargs
-#define sys_sched_getscheduler printargs
-#define sys_sched_yield printargs
-#define sys_sched_get_priority_max printargs
-#define sys_sched_get_priority_min printargs
-#define sys_sched_rr_get_interval printargs
-#define sys_utrace printargs
-int sys_sendfile();
-#define sys_kldsym printargs
-#define sys_jail printargs
-int sys_sigprocmask();
-int sys_sigsuspend();
-int sys_sigaction();
-int sys_sigpending();
-#define sys_sigreturn printargs
-#define sys___acl_get_file printargs
-#define sys___acl_set_file printargs
-#define sys___acl_get_fd printargs
-#define sys___acl_set_fd printargs
-#define sys___acl_delete_file printargs
-#define sys___acl_delete_fd printargs
-#define sys___acl_aclcheck_file printargs
-#define sys___acl_aclcheck_fd printargs
-#define sys_extattrctl printargs
-#define sys_extattr_set_file printargs
-#define sys_extattr_get_file printargs
-#define sys_extattr_delete_file printargs
-#define sys_aio_waitcomplete printargs
-#define sys_getresuid printargs
-#define sys_getresgid printargs
-#define sys_kqueue printargs
-#define sys_kevent printargs
--- a/freebsd/i386/syscallent.h
+++ b/freebsd/i386/syscallent.h
@ -1,368 +0,0 @@
-/*
- * Automatically generated by ./../syscalls.pl on Thu Mar  8 18:14:07 2001
- */
-
-  { 1,	0,	sys_syscall,	"syscall"	}, /* 0 */
-  { 1,	0,	sys_exit,	"exit"	}, /* 1 */
-  { 1,	TP,	sys_fork,	"fork"	}, /* 2 */
-  { 3,	TD,	sys_read,	"read"	}, /* 3 */
-  { 3,	TD,	sys_write,	"write"	}, /* 4 */
-  { 3,	TD|TF,	sys_open,	"open"	}, /* 5 */
-  { 1,	TF,	sys_close,	"close"	}, /* 6 */
-  { 4,	TP,	sys_wait4,	"wait4"	}, /* 7 */
-  { 2,	TD|TF,	sys_creat,	"creat?"	}, /* 8 */
-  { 2,	TF,	sys_link,	"link"	}, /* 9 */
-  { 1,	TF,	sys_unlink,	"unlink"	}, /* 10 */
-  { -1,	0,	printargs,	"SYS_11"	}, /* 11 */
-  { 1,	TF,	sys_chdir,	"chdir"	}, /* 12 */
-  { 1,	TF,	sys_fchdir,	"fchdir"	}, /* 13 */
-  { 3,	TF,	sys_mknod,	"mknod"	}, /* 14 */
-  { 2,	TF,	sys_chmod,	"chmod"	}, /* 15 */
-  { 3,	TF,	sys_chown,	"chown"	}, /* 16 */
-  { 1,	0,	sys_break,	"break"	}, /* 17 */
-  { 3,	0,	sys_getfsstat,	"getfsstat"	}, /* 18 */
-  { 3,	TD,	sys_lseek,	"lseek?"	}, /* 19 */
-  { 1,	0,	sys_getpid,	"getpid"	}, /* 20 */
-  { 4,	TF,	sys_mount,	"mount"	}, /* 21 */
-  { 2,	TF,	sys_unmount,	"unmount"	}, /* 22 */
-  { 1,	0,	sys_setuid,	"setuid"	}, /* 23 */
-  { 1,	0,	sys_getuid,	"getuid"	}, /* 24 */
-  { 1,	0,	sys_geteuid,	"geteuid"	}, /* 25 */
-  { 4,	0,	sys_ptrace,	"ptrace"	}, /* 26 */
-  { 3,	TN,	sys_recvmsg,	"recvmsg"	}, /* 27 */
-  { 3,	TN,	sys_sendmsg,	"sendmsg"	}, /* 28 */
-  { 6,	TN,	sys_recvfrom,	"recvfrom"	}, /* 29 */
-  { 3,	TN,	sys_accept,	"accept"	}, /* 30 */
-  { 3,	TN,	sys_getpeername,	"getpeername"	}, /* 31 */
-  { 3,	TN,	sys_getsockname,	"getsockname"	}, /* 32 */
-  { 2,	TF,	sys_access,	"access"	}, /* 33 */
-  { 2,	TF,	sys_chflags,	"chflags"	}, /* 34 */
-  { 2,	TF,	sys_fchflags,	"fchflags"	}, /* 35 */
-  { 1,	0,	sys_sync,	"sync"	}, /* 36 */
-  { 2,	TS,	sys_kill,	"kill"	}, /* 37 */
-  { 2,	TF,	sys_stat,	"stat?"	}, /* 38 */
-  { 1,	0,	sys_getppid,	"getppid"	}, /* 39 */
-  { 2,	TF,	sys_lstat,	"lstat?"	}, /* 40 */
-  { 1,	TD,	sys_dup,	"dup"	}, /* 41 */
-  { 1,	TD,	sys_pipe,	"pipe"	}, /* 42 */
-  { 1,	0,	sys_getegid,	"getegid"	}, /* 43 */
-  { 4,	0,	sys_profil,	"profil"	}, /* 44 */
-  { 4,	0,	sys_ktrace,	"ktrace"	}, /* 45 */
-  { 3,	TS,	sys_sigaction,	"sigaction?"	}, /* 46 */
-  { 1,	0,	sys_getgid,	"getgid"	}, /* 47 */
-  { 2,	TS,	sys_sigprocmask,	"sigprocmask?"	}, /* 48 */
-  { 2,	0,	sys_getlogin,	"getlogin"	}, /* 49 */
-  { 1,	0,	sys_setlogin,	"setlogin"	}, /* 50 */
-  { 1,	TF,	sys_acct,	"acct"	}, /* 51 */
-  { 1,	TS,	sys_sigpending,	"sigpending?"	}, /* 52 */
-  { 2,	TS,	sys_sigaltstack,	"sigaltstack"	}, /* 53 */
-  { 3,	TD,	sys_ioctl,	"ioctl"	}, /* 54 */
-  { 1,	0,	sys_reboot,	"reboot"	}, /* 55 */
-  { 1,	0,	sys_revoke,	"revoke"	}, /* 56 */
-  { 2,	TF,	sys_symlink,	"symlink"	}, /* 57 */
-  { 3,	TF,	sys_readlink,	"readlink"	}, /* 58 */
-  { 3,	TF|TP,	sys_execve,	"execve"	}, /* 59 */
-  { 1,	0,	sys_umask,	"umask"	}, /* 60 */
-  { 1,	TF,	sys_chroot,	"chroot"	}, /* 61 */
-  { 2,	TD,	sys_fstat,	"fstat?"	}, /* 62 */
-  { 4,	0,	sys_getkerninfo,	"getkerninfo?"	}, /* 63 */
-  { 1,	0,	sys_getpagesize,	"getpagesize?"	}, /* 64 */
-  { 3,	0,	sys_msync,	"msync"	}, /* 65 */
-  { 1,	TP,	sys_vfork,	"vfork"	}, /* 66 */
-  { -1,	0,	printargs,	"SYS_67"	}, /* 67 */
-  { -1,	0,	printargs,	"SYS_68"	}, /* 68 */
-  { 1,	0,	sys_sbrk,	"sbrk"	}, /* 69 */
-  { 1,	0,	sys_sstk,	"sstk"	}, /* 70 */
-  { 6,	0,	sys_mmap,	"mmap?"	}, /* 71 */
-  { 1,	0,	sys_vadvise,	"vadvise"	}, /* 72 */
-  { 2,	0,	sys_munmap,	"munmap"	}, /* 73 */
-  { 3,	0,	sys_mprotect,	"mprotect"	}, /* 74 */
-  { 3,	0,	sys_madvise,	"madvise"	}, /* 75 */
-  { -1,	0,	printargs,	"SYS_76"	}, /* 76 */
-  { -1,	0,	printargs,	"SYS_77"	}, /* 77 */
-  { 3,	0,	sys_mincore,	"mincore"	}, /* 78 */
-  { 2,	0,	sys_getgroups,	"getgroups"	}, /* 79 */
-  { 2,	0,	sys_setgroups,	"setgroups"	}, /* 80 */
-  { 1,	0,	sys_getpgrp,	"getpgrp"	}, /* 81 */
-  { 2,	0,	sys_setpgid,	"setpgid"	}, /* 82 */
-  { 3,	0,	sys_setitimer,	"setitimer"	}, /* 83 */
-  { 1,	TP,	sys_wait,	"wait?"	}, /* 84 */
-  { 1,	TF,	sys_swapon,	"swapon"	}, /* 85 */
-  { 2,	0,	sys_getitimer,	"getitimer"	}, /* 86 */
-  { 2,	0,	sys_gethostname,	"gethostname?"	}, /* 87 */
-  { 2,	0,	sys_sethostname,	"sethostname?"	}, /* 88 */
-  { 1,	0,	sys_getdtablesize,	"getdtablesize"	}, /* 89 */
-  { 2,	TD,	sys_dup2,	"dup2"	}, /* 90 */
-  { -1,	0,	printargs,	"SYS_91"	}, /* 91 */
-  { 3,	TD,	sys_fcntl,	"fcntl"	}, /* 92 */
-  { 5,	TD,	sys_select,	"select"	}, /* 93 */
-  { -1,	0,	printargs,	"SYS_94"	}, /* 94 */
-  { 1,	TD,	sys_fsync,	"fsync"	}, /* 95 */
-  { 3,	0,	sys_setpriority,	"setpriority"	}, /* 96 */
-  { 3,	TN,	sys_socket,	"socket"	}, /* 97 */
-  { 3,	TN,	sys_connect,	"connect"	}, /* 98 */
-  { 3,	TN,	sys_accept,	"accept"	}, /* 99 */
-  { 2,	0,	sys_getpriority,	"getpriority"	}, /* 100 */
-  { 4,	TN,	sys_send,	"send?"	}, /* 101 */
-  { 4,	TN,	sys_recv,	"recv?"	}, /* 102 */
-  { 1,	TS,	sys_sigreturn,	"sigreturn?"	}, /* 103 */
-  { 3,	TN,	sys_bind,	"bind"	}, /* 104 */
-  { 5,	TN,	sys_setsockopt,	"setsockopt"	}, /* 105 */
-  { 2,	TN,	sys_listen,	"listen"	}, /* 106 */
-  { -1,	0,	printargs,	"SYS_107"	}, /* 107 */
-  { 3,	TS,	sys_sigvec,	"sigvec?"	}, /* 108 */
-  { 1,	TS,	sys_sigblock,	"sigblock?"	}, /* 109 */
-  { 1,	TS,	sys_sigsetmask,	"sigsetmask?"	}, /* 110 */
-  { 1,	TS,	sys_sigsuspend,	"sigsuspend?"	}, /* 111 */
-  { 2,	TS,	sys_sigstack,	"sigstack?"	}, /* 112 */
-  { 3,	TN,	sys_recvmsg,	"recvmsg?"	}, /* 113 */
-  { 3,	TN,	sys_sendmsg,	"sendmsg?"	}, /* 114 */
-  { -1,	0,	printargs,	"SYS_115"	}, /* 115 */
-  { 2,	0,	sys_gettimeofday,	"gettimeofday"	}, /* 116 */
-  { 2,	0,	sys_getrusage,	"getrusage"	}, /* 117 */
-  { 5,	TN,	sys_getsockopt,	"getsockopt"	}, /* 118 */
-  { -1,	0,	printargs,	"SYS_119"	}, /* 119 */
-  { 3,	TD,	sys_readv,	"readv"	}, /* 120 */
-  { 3,	TD,	sys_writev,	"writev"	}, /* 121 */
-  { 2,	0,	sys_settimeofday,	"settimeofday"	}, /* 122 */
-  { 3,	TD,	sys_fchown,	"fchown"	}, /* 123 */
-  { 2,	TD,	sys_fchmod,	"fchmod"	}, /* 124 */
-  { 6,	TN,	sys_recvfrom,	"recvfrom"	}, /* 125 */
-  { 2,	0,	sys_setreuid,	"setreuid"	}, /* 126 */
-  { 2,	0,	sys_setregid,	"setregid"	}, /* 127 */
-  { 2,	TF,	sys_rename,	"rename"	}, /* 128 */
-  { 2,	TF,	sys_truncate,	"truncate?"	}, /* 129 */
-  { 2,	TD,	sys_ftruncate,	"ftruncate?"	}, /* 130 */
-  { 2,	TD,	sys_flock,	"flock"	}, /* 131 */
-  { 2,	0,	sys_mkfifo,	"mkfifo"	}, /* 132 */
-  { 6,	TN,	sys_sendto,	"sendto"	}, /* 133 */
-  { 2,	TN,	sys_shutdown,	"shutdown"	}, /* 134 */
-  { 4,	TN,	sys_socketpair,	"socketpair"	}, /* 135 */
-  { 2,	TF,	sys_mkdir,	"mkdir"	}, /* 136 */
-  { 1,	TF,	sys_rmdir,	"rmdir"	}, /* 137 */
-  { 2,	TF,	sys_utimes,	"utimes"	}, /* 138 */
-  { -1,	0,	printargs,	"SYS_139"	}, /* 139 */
-  { 2,	0,	sys_adjtime,	"adjtime"	}, /* 140 */
-  { 3,	TN,	sys_getpeername,	"getpeername?"	}, /* 141 */
-  { 1,	0,	sys_gethostid,	"gethostid?"	}, /* 142 */
-  { 1,	0,	sys_sethostid,	"sethostid?"	}, /* 143 */
-  { 2,	0,	sys_getrlimit,	"getrlimit?"	}, /* 144 */
-  { 2,	0,	sys_setrlimit,	"setrlimit?"	}, /* 145 */
-  { 2,	TS,	sys_killpg,	"killpg?"	}, /* 146 */
-  { 1,	0,	sys_setsid,	"setsid"	}, /* 147 */
-  { 4,	0,	sys_quotactl,	"quotactl"	}, /* 148 */
-  { 1,	0,	sys_quota,	"quota?"	}, /* 149 */
-  { 3,	TN,	sys_getsockname,	"getsockname"	}, /* 150 */
-  { -1,	0,	printargs,	"SYS_151"	}, /* 151 */
-  { -1,	0,	printargs,	"SYS_152"	}, /* 152 */
-  { -1,	0,	printargs,	"SYS_153"	}, /* 153 */
-  { -1,	0,	printargs,	"SYS_154"	}, /* 154 */
-  { 2,	0,	sys_nfssvc,	"nfssvc"	}, /* 155 */
-  { 4,	0,	sys_getdirentries,	"getdirentries?"	}, /* 156 */
-  { 2,	TF,	sys_statfs,	"statfs"	}, /* 157 */
-  { 2,	TD,	sys_fstatfs,	"fstatfs"	}, /* 158 */
-  { -1,	0,	printargs,	"SYS_159"	}, /* 159 */
-  { -1,	0,	printargs,	"SYS_160"	}, /* 160 */
-  { 2,	0,	sys_getfh,	"getfh"	}, /* 161 */
-  { 2,	0,	sys_getdomainname,	"getdomainname"	}, /* 162 */
-  { 2,	0,	sys_setdomainname,	"setdomainname"	}, /* 163 */
-  { 1,	0,	sys_uname,	"uname"	}, /* 164 */
-  { 2,	0,	sys_sysarch,	"sysarch"	}, /* 165 */
-  { 3,	0,	sys_rtprio,	"rtprio"	}, /* 166 */
-  { -1,	0,	printargs,	"SYS_167"	}, /* 167 */
-  { -1,	0,	printargs,	"SYS_168"	}, /* 168 */
-  { 5,	TI,	sys_semsys,	"semsys"	}, /* 169 */
-  { 6,	TI,	sys_msgsys,	"msgsys"	}, /* 170 */
-  { 4,	TI,	sys_shmsys,	"shmsys"	}, /* 171 */
-  { -1,	0,	printargs,	"SYS_172"	}, /* 172 */
-  { 5,	TD,	sys_pread,	"pread"	}, /* 173 */
-  { 5,	TD,	sys_pwrite,	"pwrite"	}, /* 174 */
-  { -1,	0,	printargs,	"SYS_175"	}, /* 175 */
-  { 1,	0,	sys_ntp_adjtime,	"ntp_adjtime"	}, /* 176 */
-  { -1,	0,	printargs,	"SYS_177"	}, /* 177 */
-  { -1,	0,	printargs,	"SYS_178"	}, /* 178 */
-  { -1,	0,	printargs,	"SYS_179"	}, /* 179 */
-  { -1,	0,	printargs,	"SYS_180"	}, /* 180 */
-  { 1,	0,	sys_setgid,	"setgid"	}, /* 181 */
-  { 1,	0,	sys_setegid,	"setegid"	}, /* 182 */
-  { 1,	0,	sys_seteuid,	"seteuid"	}, /* 183 */
-  { -1,	0,	printargs,	"SYS_184"	}, /* 184 */
-  { -1,	0,	printargs,	"SYS_185"	}, /* 185 */
-  { -1,	0,	printargs,	"SYS_186"	}, /* 186 */
-  { -1,	0,	printargs,	"SYS_187"	}, /* 187 */
-  { 2,	TF,	sys_stat,	"stat"	}, /* 188 */
-  { 2,	TD,	sys_fstat,	"fstat"	}, /* 189 */
-  { 2,	TF,	sys_lstat,	"lstat"	}, /* 190 */
-  { 2,	TF,	sys_pathconf,	"pathconf"	}, /* 191 */
-  { 2,	0,	sys_fpathconf,	"fpathconf"	}, /* 192 */
-  { -1,	0,	printargs,	"SYS_193"	}, /* 193 */
-  { 2,	0,	sys_getrlimit,	"getrlimit"	}, /* 194 */
-  { 2,	0,	sys_setrlimit,	"setrlimit"	}, /* 195 */
-  { 4,	0,	sys_getdirentries,	"getdirentries"	}, /* 196 */
-  { 7,	0,	sys_mmap,	"mmap"	}, /* 197 */
-  { 1,	0,	sys___syscall,	"__syscall"	}, /* 198 */
-  { 4,	TD,	sys_lseek,	"lseek"	}, /* 199 */
-  { 3,	TF,	sys_truncate,	"truncate"	}, /* 200 */
-  { 3,	TD,	sys_ftruncate,	"ftruncate"	}, /* 201 */
-  { 6,	0,	sys___sysctl,	"__sysctl"	}, /* 202 */
-  { 2,	0,	sys_mlock,	"mlock"	}, /* 203 */
-  { 2,	0,	sys_munlock,	"munlock"	}, /* 204 */
-  { 1,	0,	sys_undelete,	"undelete"	}, /* 205 */
-  { 2,	0,	sys_futimes,	"futimes"	}, /* 206 */
-  { 1,	0,	sys_getpgid,	"getpgid"	}, /* 207 */
-  { -1,	0,	printargs,	"SYS_208"	}, /* 208 */
-  { 3,	TN,	sys_poll,	"poll"	}, /* 209 */
-  { -1,	0,	printargs,	"SYS_210"	}, /* 210 */
-  { -1,	0,	printargs,	"SYS_211"	}, /* 211 */
-  { -1,	0,	printargs,	"SYS_212"	}, /* 212 */
-  { -1,	0,	printargs,	"SYS_213"	}, /* 213 */
-  { -1,	0,	printargs,	"SYS_214"	}, /* 214 */
-  { -1,	0,	printargs,	"SYS_215"	}, /* 215 */
-  { -1,	0,	printargs,	"SYS_216"	}, /* 216 */
-  { -1,	0,	printargs,	"SYS_217"	}, /* 217 */
-  { -1,	0,	printargs,	"SYS_218"	}, /* 218 */
-  { -1,	0,	printargs,	"SYS_219"	}, /* 219 */
-  { 4,	0,	sys___semctl,	"__semctl"	}, /* 220 */
-  { 3,	TI,	sys_semget,	"semget"	}, /* 221 */
-  { 3,	TI,	sys_semop,	"semop"	}, /* 222 */
-  { -1,	0,	printargs,	"SYS_223"	}, /* 223 */
-  { 3,	TI,	sys_msgctl,	"msgctl"	}, /* 224 */
-  { 2,	TI,	sys_msgget,	"msgget"	}, /* 225 */
-  { 4,	TI,	sys_msgsnd,	"msgsnd"	}, /* 226 */
-  { 5,	TI,	sys_msgrcv,	"msgrcv"	}, /* 227 */
-  { 3,	TI,	sys_shmat,	"shmat"	}, /* 228 */
-  { 3,	TI,	sys_shmctl,	"shmctl"	}, /* 229 */
-  { 1,	TI,	sys_shmdt,	"shmdt"	}, /* 230 */
-  { 3,	TI,	sys_shmget,	"shmget"	}, /* 231 */
-  { 2,	0,	sys_clock_gettime,	"clock_gettime"	}, /* 232 */
-  { 2,	0,	sys_clock_settime,	"clock_settime"	}, /* 233 */
-  { 2,	0,	sys_clock_getres,	"clock_getres"	}, /* 234 */
-  { -1,	0,	printargs,	"SYS_235"	}, /* 235 */
-  { -1,	0,	printargs,	"SYS_236"	}, /* 236 */
-  { -1,	0,	printargs,	"SYS_237"	}, /* 237 */
-  { -1,	0,	printargs,	"SYS_238"	}, /* 238 */
-  { -1,	0,	printargs,	"SYS_239"	}, /* 239 */
-  { 2,	0,	sys_nanosleep,	"nanosleep"	}, /* 240 */
-  { -1,	0,	printargs,	"SYS_241"	}, /* 241 */
-  { -1,	0,	printargs,	"SYS_242"	}, /* 242 */
-  { -1,	0,	printargs,	"SYS_243"	}, /* 243 */
-  { -1,	0,	printargs,	"SYS_244"	}, /* 244 */
-  { -1,	0,	printargs,	"SYS_245"	}, /* 245 */
-  { -1,	0,	printargs,	"SYS_246"	}, /* 246 */
-  { -1,	0,	printargs,	"SYS_247"	}, /* 247 */
-  { -1,	0,	printargs,	"SYS_248"	}, /* 248 */
-  { -1,	0,	printargs,	"SYS_249"	}, /* 249 */
-  { 3,	0,	sys_minherit,	"minherit"	}, /* 250 */
-  { 1,	0,	sys_rfork,	"rfork"	}, /* 251 */
-  { 3,	0,	sys_openbsd_poll,	"openbsd_poll"	}, /* 252 */
-  { 1,	0,	sys_issetugid,	"issetugid"	}, /* 253 */
-  { 3,	TF,	sys_lchown,	"lchown"	}, /* 254 */
-  { -1,	0,	printargs,	"SYS_255"	}, /* 255 */
-  { -1,	0,	printargs,	"SYS_256"	}, /* 256 */
-  { -1,	0,	printargs,	"SYS_257"	}, /* 257 */
-  { -1,	0,	printargs,	"SYS_258"	}, /* 258 */
-  { -1,	0,	printargs,	"SYS_259"	}, /* 259 */
-  { -1,	0,	printargs,	"SYS_260"	}, /* 260 */
-  { -1,	0,	printargs,	"SYS_261"	}, /* 261 */
-  { -1,	0,	printargs,	"SYS_262"	}, /* 262 */
-  { -1,	0,	printargs,	"SYS_263"	}, /* 263 */
-  { -1,	0,	printargs,	"SYS_264"	}, /* 264 */
-  { -1,	0,	printargs,	"SYS_265"	}, /* 265 */
-  { -1,	0,	printargs,	"SYS_266"	}, /* 266 */
-  { -1,	0,	printargs,	"SYS_267"	}, /* 267 */
-  { -1,	0,	printargs,	"SYS_268"	}, /* 268 */
-  { -1,	0,	printargs,	"SYS_269"	}, /* 269 */
-  { -1,	0,	printargs,	"SYS_270"	}, /* 270 */
-  { -1,	0,	printargs,	"SYS_271"	}, /* 271 */
-  { 3,	TD,	sys_getdents,	"getdents"	}, /* 272 */
-  { -1,	0,	printargs,	"SYS_273"	}, /* 273 */
-  { 2,	0,	sys_lchmod,	"lchmod"	}, /* 274 */
-  { 3,	0,	sys_netbsd_lchown,	"netbsd_lchown"	}, /* 275 */
-  { 2,	0,	sys_lutimes,	"lutimes"	}, /* 276 */
-  { 3,	0,	sys_netbsd_msync,	"netbsd_msync"	}, /* 277 */
-  { 2,	0,	sys_nstat,	"nstat"	}, /* 278 */
-  { 2,	0,	sys_nfstat,	"nfstat"	}, /* 279 */
-  { 2,	0,	sys_nlstat,	"nlstat"	}, /* 280 */
-  { -1,	0,	printargs,	"SYS_281"	}, /* 281 */
-  { -1,	0,	printargs,	"SYS_282"	}, /* 282 */
-  { -1,	0,	printargs,	"SYS_283"	}, /* 283 */
-  { -1,	0,	printargs,	"SYS_284"	}, /* 284 */
-  { -1,	0,	printargs,	"SYS_285"	}, /* 285 */
-  { -1,	0,	printargs,	"SYS_286"	}, /* 286 */
-  { -1,	0,	printargs,	"SYS_287"	}, /* 287 */
-  { -1,	0,	printargs,	"SYS_288"	}, /* 288 */
-  { -1,	0,	printargs,	"SYS_289"	}, /* 289 */
-  { -1,	0,	printargs,	"SYS_290"	}, /* 290 */
-  { -1,	0,	printargs,	"SYS_291"	}, /* 291 */
-  { -1,	0,	printargs,	"SYS_292"	}, /* 292 */
-  { -1,	0,	printargs,	"SYS_293"	}, /* 293 */
-  { -1,	0,	printargs,	"SYS_294"	}, /* 294 */
-  { -1,	0,	printargs,	"SYS_295"	}, /* 295 */
-  { -1,	0,	printargs,	"SYS_296"	}, /* 296 */
-  { 2,	0,	sys_fhstatfs,	"fhstatfs"	}, /* 297 */
-  { 2,	0,	sys_fhopen,	"fhopen"	}, /* 298 */
-  { 2,	0,	sys_fhstat,	"fhstat"	}, /* 299 */
-  { 1,	0,	sys_modnext,	"modnext"	}, /* 300 */
-  { 2,	0,	sys_modstat,	"modstat"	}, /* 301 */
-  { 1,	0,	sys_modfnext,	"modfnext"	}, /* 302 */
-  { 1,	0,	sys_modfind,	"modfind"	}, /* 303 */
-  { 1,	0,	sys_kldload,	"kldload"	}, /* 304 */
-  { 1,	0,	sys_kldunload,	"kldunload"	}, /* 305 */
-  { 1,	0,	sys_kldfind,	"kldfind"	}, /* 306 */
-  { 1,	0,	sys_kldnext,	"kldnext"	}, /* 307 */
-  { 2,	0,	sys_kldstat,	"kldstat"	}, /* 308 */
-  { 1,	0,	sys_kldfirstmod,	"kldfirstmod"	}, /* 309 */
-  { 1,	0,	sys_getsid,	"getsid"	}, /* 310 */
-  { 3,	0,	sys_setresuid,	"setresuid"	}, /* 311 */
-  { 3,	0,	sys_setresgid,	"setresgid"	}, /* 312 */
-  { -1,	0,	printargs,	"SYS_313"	}, /* 313 */
-  { 1,	0,	sys_aio_return,	"aio_return"	}, /* 314 */
-  { 3,	0,	sys_aio_suspend,	"aio_suspend"	}, /* 315 */
-  { 2,	0,	sys_aio_cancel,	"aio_cancel"	}, /* 316 */
-  { 1,	0,	sys_aio_error,	"aio_error"	}, /* 317 */
-  { 1,	0,	sys_aio_read,	"aio_read"	}, /* 318 */
-  { 1,	0,	sys_aio_write,	"aio_write"	}, /* 319 */
-  { 4,	0,	sys_lio_listio,	"lio_listio"	}, /* 320 */
-  { 1,	0,	sys_yield,	"yield"	}, /* 321 */
-  { 1,	0,	sys_thr_sleep,	"thr_sleep"	}, /* 322 */
-  { 1,	0,	sys_thr_wakeup,	"thr_wakeup"	}, /* 323 */
-  { 1,	0,	sys_mlockall,	"mlockall"	}, /* 324 */
-  { 1,	0,	sys_munlockall,	"munlockall"	}, /* 325 */
-  { 2,	0,	sys___getcwd,	"__getcwd"	}, /* 326 */
-  { 2,	0,	sys_sched_setparam,	"sched_setparam"	}, /* 327 */
-  { 2,	0,	sys_sched_getparam,	"sched_getparam"	}, /* 328 */
-  { 3,	0,	sys_sched_setscheduler,	"sched_setscheduler"	}, /* 329 */
-  { 1,	0,	sys_sched_getscheduler,	"sched_getscheduler"	}, /* 330 */
-  { 1,	0,	sys_sched_yield,	"sched_yield"	}, /* 331 */
-  { 1,	0,	sys_sched_get_priority_max,	"sched_get_priority_max"	}, /* 332 */
-  { 1,	0,	sys_sched_get_priority_min,	"sched_get_priority_min"	}, /* 333 */
-  { 2,	0,	sys_sched_rr_get_interval,	"sched_rr_get_interval"	}, /* 334 */
-  { 2,	0,	sys_utrace,	"utrace"	}, /* 335 */
-  { 7,	TD|TN,	sys_sendfile,	"sendfile"	}, /* 336 */
-  { 3,	0,	sys_kldsym,	"kldsym"	}, /* 337 */
-  { 1,	0,	sys_jail,	"jail"	}, /* 338 */
-  { -1,	0,	printargs,	"SYS_339"	}, /* 339 */
-  { 3,	TS,	sys_sigprocmask,	"sigprocmask"	}, /* 340 */
-  { 1,	TS,	sys_sigsuspend,	"sigsuspend"	}, /* 341 */
-  { 3,	TS,	sys_sigaction,	"sigaction"	}, /* 342 */
-  { 1,	TS,	sys_sigpending,	"sigpending"	}, /* 343 */
-  { 1,	TS,	sys_sigreturn,	"sigreturn"	}, /* 344 */
-  { -1,	0,	printargs,	"SYS_345"	}, /* 345 */
-  { -1,	0,	printargs,	"SYS_346"	}, /* 346 */
-  { 3,	0,	sys___acl_get_file,	"__acl_get_file"	}, /* 347 */
-  { 3,	0,	sys___acl_set_file,	"__acl_set_file"	}, /* 348 */
-  { 3,	0,	sys___acl_get_fd,	"__acl_get_fd"	}, /* 349 */
-  { 3,	0,	sys___acl_set_fd,	"__acl_set_fd"	}, /* 350 */
-  { 2,	0,	sys___acl_delete_file,	"__acl_delete_file"	}, /* 351 */
-  { 2,	0,	sys___acl_delete_fd,	"__acl_delete_fd"	}, /* 352 */
-  { 3,	0,	sys___acl_aclcheck_file,	"__acl_aclcheck_file"	}, /* 353 */
-  { 3,	0,	sys___acl_aclcheck_fd,	"__acl_aclcheck_fd"	}, /* 354 */
-  { 4,	0,	sys_extattrctl,	"extattrctl"	}, /* 355 */
-  { 4,	0,	sys_extattr_set_file,	"extattr_set_file"	}, /* 356 */
-  { 4,	0,	sys_extattr_get_file,	"extattr_get_file"	}, /* 357 */
-  { 2,	0,	sys_extattr_delete_file,	"extattr_delete_file"	}, /* 358 */
-  { 2,	0,	sys_aio_waitcomplete,	"aio_waitcomplete"	}, /* 359 */
-  { 3,	0,	sys_getresuid,	"getresuid"	}, /* 360 */
-  { 3,	0,	sys_getresgid,	"getresgid"	}, /* 361 */
-  { 1,	0,	sys_kqueue,	"kqueue"	}, /* 362 */
-  { 6,	0,	sys_kevent,	"kevent"	}, /* 363 */
--- a/freebsd/ioctlent.sh
+++ b/freebsd/ioctlent.sh
@ -1,62 +0,0 @@
-#!/bin/sh
-
-# initialy from $FreeBSD: src/usr.bin/kdump/mkioctls,v 1.18 2000/08/02 07:37:44 ru Exp $
-# changed by Ga<47>l Roualland.
-
-# Validate arg count.
-if [ $# -ne 1 ]
-then
-        echo "usage: $0 include-directory" >&2
-        exit 1
-fi
-
-# build a list of files with ioctls
-ioctl_includes=`
-	cd $1
-	find * -name '*.h' -follow |
-		egrep -v '^(netns)/' |
-		xargs egrep -l \
-'^#[ 	]*define[ 	]+[A-Za-z_][A-Za-z0-9_]*[ 	]+_IO[^a-z0-9_]'`
-
-# Generate the output file.
-echo '/* This file is automatically generated by ioctlent.sh */'
-echo
-echo '/* XXX obnoxious prerequisites. */'
-echo '#define COMPAT_43'
-echo
-echo '#include <sys/types.h>'
-echo '#include <sys/param.h>'
-echo '#include <sys/devicestat.h>'
-echo '#include <sys/disklabel.h>'
-echo '#include <sys/socket.h>'
-echo '#include <sys/time.h>'
-echo '#include <sys/tty.h>'
-echo '#include <net/ethernet.h>'
-echo '#include <net/if.h>'
-echo '#include <net/if_var.h>'
-echo '#include <net/route.h>'
-echo '#include <netatm/atm.h>'
-echo '#include <netatm/atm_if.h>'
-echo '#include <netatm/atm_sap.h>'
-echo '#include <netatm/atm_sys.h>'
-echo '#include <netinet/in.h>'
-echo '#include <netinet/ip_compat.h>'
-echo '#include <netinet/ip_fil.h>'
-echo '#include <netinet/ip_auth.h>'
-echo '#include <netinet/ip_nat.h>'
-echo '#include <netinet/ip_frag.h>'
-echo '#include <netinet/ip_state.h>'
-echo '#include <netinet/ip_mroute.h>'
-echo '#include <netinet6/in6_var.h>'
-echo '#include <netinet6/nd6.h>'
-echo '#include <netinet6/ip6_mroute.h>'
-echo '#include <cam/cam.h>'
-echo '#include <stdio.h>'
-echo
-echo "$ioctl_includes" | sed -e 's/^/#include </' -e s'/$/>/'
-echo
-echo 'struct ioctlent ioctlent [] ='
-echo '{'
-(cd $1 && for i in $ioctl_includes ; do echo "#include <$i>" | gcc -I$1 -E -dM - | egrep '^#[ 	]*define[ 	]+[A-Za-z_][A-Za-z0-9_]*[ 	]+_IO[^a-z0-9_]' | sed -n -e 's|^#[ 	]*define[ 	]*\([A-Za-z_][A-Za-z0-9_]*\).*|	{ "'$i'", "\1", \1 },|p' ; done )
-
-echo '};'
--- a/freebsd/syscalls.cat
+++ b/freebsd/syscalls.cat
@ -1,177 +0,0 @@
-#
-# Copyright (c) 2000, Ga<47>l Roualland <gael.roualland@iname.com>
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote products
-#    derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-#      $Id$
-#
-# Syscalls categories
-# syntax: syscall catmask
-#
-# mostly built from other archs/os syscallent.h
-
-# file calls
-access	TF
-acct	TF
-acl	TF
-chdir	TF
-chmod	TF
-chown	TF
-chroot	TF
-creat	TF
-close 	TF
-chflags	TF
-fstat64	TF
-fstat	TF
-fchdir	TF
-fchflags	TF
-lchown	TF
-link	TF
-lstat	TF
-lstat64	TF
-lxstat	TF
-mkdir	TF
-mknod	TF
-mount	TF
-oldlstat	TF
-oldstat	TF
-oldumount	TF
-open	TF
-outime	TF
-pathconf	TF
-pread	TF
-pwrite	TF
-readlink	TF
-rename	TF
-rmdir	TF
-sendfile	TF
-stat	TF
-stat64	TF
-statfs	TF
-statvfs	TF
-swapon	TF
-symlink	TF
-truncate	TF
-umount	TF
-unlink	TF
-unmount	TF
-uselib	TF
-utime	TF
-utimes	TF
-xmknod	TF
-xstat	TF
-
-# file/process calls
-exec	TF|TP
-execv	TF|TP
-execve	TF|TP
-
-# IPC calls
-msgctl	TI
-msgget	TI
-msgrcv	TI
-msgsnd	TI
-msgsys	TI
-semctl	TI
-semget	TI
-semop	TI
-semsys	TI
-shmat	TI
-shmctl	TI
-shmdt	TI
-shmget	TI
-shmsys	TI
-
-# network calls
-accept	TN
-bind	TN
-connect	TN
-getmsg	TN
-getpeername	TN
-getpmsg	TN
-getsockname	TN
-getsockopt	TN
-listen	TN
-poll	TN
-putmsg	TN
-putpmsg	TN
-recv	TN
-recvfrom	TN
-recvmsg	TN
-send	TN
-sendmsg	TN
-sendto	TN
-setsockopt	TN
-shutdown	TN
-socket	TN
-socketpair	TN
-
-# process calls
-_exit	TP
-clone	TP
-fork	TP
-fork1	TP
-owait	TP
-owait3	TP
-vfork	TP
-wait	TP
-wait4	TP
-waitid	TP
-waitpid	TP
-waitsys	TP
-
-# signal calls
-kill	TS
-killpg	TS
-ksigqueue	TS
-pause	TS
-rt_sigaction	TS
-rt_sigpending	TS
-rt_sigprocmask	TS
-rt_sigqueueinfo	TS
-rt_sigreturn	TS
-rt_sigsuspend	TS
-rt_sigtimedwait	TS
-sigaction	TS
-sigaltstack	TS
-sigblock	TS
-sigcleanup	TS
-sigfillset	TS
-siggetmask	TS
-sighold	TS
-sigignore	TS
-signal	TS
-sigpause	TS
-sigpending	TS
-sigpoll	TS
-sigprocmask	TS
-sigrelse	TS
-sigreturn	TS
-sigsendset	TS
-sigset	TS
-sigsetmask	TS
-sigstack	TS
-sigsuspend	TS
-sigtimedwait	TS
-sigvec	TS
--- a/freebsd/syscalls.pl
+++ b/freebsd/syscalls.pl
@ -1,156 +0,0 @@
-#!/usr/bin/perl -w
-#
-# Copyright (c) 2000, Ga<47>l Roualland <gael.roualland@iname.com>
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote products
-#    derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-#      $Id$
-#/
-
-# Buils syscall.h and syscallent.h from:
-# - syscalls.cat containing lines of format: syscall catmask
-# - syscalls.print containing lines of format: syscall [printfunction]
-#   if no printfunction is provided, sys_<call> is used.
-# - syscalls.master in the FreeBSD kernel source tree (/usr/src/sys/kern)
-
-use strict;
-use POSIX;
-
-use vars qw(%sysprint %syscat);
-
-sub usage() {
-    print STDERR
-	"usage: $0 syscalls.master [<syscalls.print>] [<syscalls.cat>]\n";
-    exit 1;
-}
-
-sub readprint ($) {
-    my($fprint) = @_;
-
-    open (PRINT, "< $fprint") || die "can't open $fprint: $!";
-    while(<PRINT>) {
-	chomp;
-	s/^\s*//;
-	s/\s+$//;
-	s/#.*$//;
-	my($sys, $func) = split(/\s+/);
-	if (defined($sys)) {
-	    if (defined($func)) {
-		$sysprint{$sys} = $func;
-	    } else {
-		$sysprint{$sys} = "sys_$sys";
-	    }
-	}
-    }
-    close(PRINT);
-}
-
-sub readcat ($) {
-    my($fcat) = @_;
-
-    open (CAT, "< $fcat") || die "can't open $fcat: $!";
-    while(<CAT>) {
-	chomp;
-	s/^\s*//;
-	s/\s+$//;
-	s/#.*$//;
-	my($sys, $cat) = split(/\s+/);
-	$syscat{$sys} = $cat if (defined($sys) && defined($cat));
-    }
-    close(CAT);
-}
-
-
-usage if (!defined($ARGV[0]) || defined($ARGV[3]));
-
-%sysprint = ();
-readprint $ARGV[1] if defined $ARGV[1];
-
-%syscat = ();
-readcat $ARGV[2] if defined $ARGV[2];
-
-open(MASTER, "< $ARGV[0]") || die "can't open $ARGV[0]: $!";
-
-open(SYSCALL, "> syscall.h") || die "can't create syscall.h: $!";
-
-print SYSCALL "/*\n * Automatically generated by $0 on " . ctime(time()) . " */\n\n";
-print "/*\n * Automatically generated by $0 on " . ctime(time()) . " */\n\n";
-
-my $sysnum = 0;
-
-while (<MASTER>) {
-    chomp;
-    # join broken lines
-    while (/\\$/) {
-	my $line;
-	s/\\$//;
-	$line = <MASTER>;
-	chomp($line);
-	$_ = "$_$line";
-    }
-
-    if (/^(\d+)\s+(?:MPSAFE\s+)?(\w+)\s+\w+\s+\{\s*([^}]+)\s*\}([^}]*)$/) {
-	my($compat, $proto, $ext, $name, $nargs, @args, $pfunc, $cat);
-
-	next if $2 eq 'OBSOL' || $2 eq 'UNIMPL';
-
-	$compat = $2 eq 'COMPAT' ? '?' : "";
-
-	$proto = $3;
-	$ext = $4;
-
-	if ($1 > $sysnum) { # syscall gap
-	    while($sysnum < $1) {
-		print "  { -1,\t0,\tprintargs,\t\"SYS_$sysnum\"\t}, /* $sysnum */\n";
-		$sysnum++;
-	    }
-	} elsif ($1 < $sysnum) {
-	    warn "error in master file: syscall $1 found, expecting $sysnum.";
-	}
-
-	if ($proto =~ /^[^\s]+\s+([^\s]+)\s*\(([^)]*)\);/) {
-	    my @args = split(/,/, $2);
-	    $nargs = @args;
-	    $name = $1;
-	    $name = $1 if ($ext =~ /^\s*([^\s]+)\s+[^\s]+\s+[^\s]+$/);
-	    if (defined($sysprint{$name})) {
-		$pfunc = $sysprint{$name};
-		print SYSCALL "int $pfunc();\n";
-	    } else {
-		$pfunc = "sys_$name";
-		print SYSCALL "#define $pfunc printargs\n";
-	    }
-	    if (defined($syscat{$name})) {
-		$cat = $syscat{$name};
-	    } else {
-		$cat = "0";
-	    }
-	    $name .= $compat;
-	    print "  { $nargs,\t$cat,\t$pfunc,\t\"$name\"\t}, /* $sysnum */\n";
-	    $sysnum++;
-	} else {
-	    warn "bad syscall specification for $sysnum: $proto";
-	}
-    }
-}
--- a/freebsd/syscalls.print
+++ b/freebsd/syscalls.print
@ -1,192 +0,0 @@
-#
-# Copyright (c) 2000, Ga<47>l Roualland <gael.roualland@iname.com>
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote products
-#    derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-#      $Id$
-#
-# Printable syscalls
-# syntax: syscall [printfunc]
-#
-# mostly built from sys_* functions in source code
-
-__getcwd
-__sysctl
-accept
-access
-adjtime
-alarm
-bind
-brk
-capget
-capset
-chdir
-chflags
-chmod
-chown
-chroot
-close
-connect
-creat
-dup
-dup2
-errlist
-execv
-execve
-exit
-fchdir
-fchflags
-fchmod
-fchown
-fchroot
-fcntl
-flock
-fork
-fpathconf
-fstat
-fstatfs
-fsync
-ftruncate
-getdents
-getdirentries
-getdomainname
-getdtablesize
-getgid
-getgroups
-gethostid
-gethostname
-getitimer
-getpagesize
-getpeername
-getpgid
-getpgrp
-getpid
-getpriority
-getrlimit
-getrusage
-getsid
-getsockname
-getsockopt
-gettimeofday
-getuid
-indir
-ioctl
-kill
-killpg
-link
-listen
-lseek
-lstat
-mincore
-mkdir
-mkfifo
-mknod
-mmap
-mprotect
-msgctl
-msgget
-msgrcv
-msgsnd
-msync
-munmap
-nerr
-nice
-open
-pathconf
-pipe
-poll
-pread
-ptrace
-pwrite
-quotactl
-read
-readlink
-readv
-recv
-recvfrom
-recvmsg
-rename
-rmdir
-sbrk
-select
-semctl
-semget
-semop
-send
-sendfile
-sendmsg
-sendto
-setdomainname
-setgroups
-sethostname
-setitimer
-setpgid
-setpgrp
-setpriority
-setregid
-setresgid
-setresuid
-setreuid
-setrlimit
-setsid
-setsockopt
-settimeofday
-shmat
-shmctl
-shmdt
-shmget
-shutdown
-sigaction
-sigaltstack
-sigblock
-sigcleanup
-signal
-sigpause
-sigpending
-sigprocmask
-sigsetmask
-sigstack
-sigsuspend
-sigvec
-socket
-socketpair
-stat
-statfs
-stime
-symlink
-sysctl
-time
-times
-truncate
-umask
-uname
-unlink
-utime
-utimes
-vfork
-wait
-wait4
-waitpid
-write
-writev
--- a/48
+++ b/48
@ -1,13 +1,15 @@
-#!/usr/bin/perl
+eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}'
+  & eval 'exec perl -wS "$0" $argv:q'
+    if 0;
 # Convert git log output to ChangeLog format.

-my $VERSION = '2009-06-04 08:53'; # UTC
+my $VERSION = '2011-10-31 16:06'; # UTC
 # The definition above must lie within the first 8 lines in order
 # for the Emacs time-stamp write hook (at end) to update it.
 # If you change this file with Emacs, please let the write hook
 # do its job.  Otherwise, update this string manually.

-# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2008-2011 Free Software Foundation, Inc.

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@ -60,6 +62,11 @@ OPTIONS:

   --since=DATE convert only the logs since DATE;
                  the default is to convert all log entries.
+   --format=FMT set format string for commit subject and body;
+                  see 'man git-log' for the list of format metacharacters;
+                  the default is '%s%n%b%n'
+   --append-dot append a dot to the first line of each commit message if
+                  there is no other punctuation or blank at the end.

   --help       display this help and exit
   --version    output version information and exit
@ -95,16 +102,23 @@ sub quoted_cmd(@)
 }

 {
-  my $since_date = '1970-01-01 UTC';
+  my $since_date;
+  my $format_string = '%s%n%b%n';
+  my $append_dot = 0;
  GetOptions
    (
     help => sub { usage 0 },
     version => sub { print "$ME version $VERSION\n"; exit },
     'since=s' => \$since_date,
+     'format=s' => \$format_string,
+     'append-dot' => \$append_dot,
    ) or usage 1;

-  my @cmd = (qw (git log --log-size), "--since=$since_date",
-             '--pretty=format:%ct  %an  <%ae>%n%n%s%n%b%n', @ARGV);
+  defined $since_date
+    and unshift @ARGV, "--since=$since_date";
+
+  my @cmd = (qw (git log --log-size),
+             '--pretty=format:%ct  %an  <%ae>%n%n'.$format_string, @ARGV);
  open PIPE, '-|', @cmd
    or die ("$ME: failed to run `". quoted_cmd (@cmd) ."': $!\n"
            . "(Is your Git too old?  Version 1.5.1 or later is required.)\n");
@ -145,6 +159,13 @@ sub quoted_cmd(@)
      # Omit "Signed-off-by..." lines.
      @line = grep !/^Signed-off-by: .*>$/, @line;

+      # Remove leading and trailing blank lines.
+      if (@line)
+        {
+          while ($line[0] =~ /^\s*$/) { shift @line; }
+          while ($line[$#line] =~ /^\s*$/) { pop @line; }
+        }
+
      # If there were any lines
      if (@line == 0)
        {
@ -152,9 +173,17 @@ sub quoted_cmd(@)
        }
      else
        {
-          # Remove leading and trailing blank lines.
-          while ($line[0] =~ /^\s*$/) { shift @line; }
-          while ($line[$#line] =~ /^\s*$/) { pop @line; }
+          if ($append_dot)
+            {
+              # If the first line of the message has enough room, then
+              if (length $line[0] < 72)
+                {
+                  # append a dot if there is no other punctuation or blank
+                  # at the end.
+                  $line[0] =~ /[[:punct:]\s]$/
+                    or $line[0] .= '.';
+                }
+            }

          # Prefix each non-empty line with a TAB.
          @line = map { length $_ ? "\t$_" : '' } @line;
@ -174,6 +203,7 @@ sub quoted_cmd(@)
 }

 # Local Variables:
+# mode: perl
 # indent-tabs-mode: nil
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "my $VERSION = '"
--- a/io.c
+++ b/io.c
@ -26,32 +26,20 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id$
 */

 #include "defs.h"
-
 #include <fcntl.h>
 #if HAVE_SYS_UIO_H
-#include <sys/uio.h>
-#endif
-
-#ifdef HAVE_LONG_LONG_OFF_T
-/*
- * Hacks for systems that have a long long off_t
- */
-
-#define sys_pread64	sys_pread
-#define sys_pwrite64	sys_pwrite
+# include <sys/uio.h>
 #endif

 int
-sys_read(tcp)
-struct tcb *tcp;
+sys_read(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		tprintf("%ld, ", tcp->u_arg[0]);
+		printfd(tcp, tcp->u_arg[0]);
+		tprints(", ");
 	} else {
 		if (syserror(tcp))
 			tprintf("%#lx", tcp->u_arg[1]);
@ -63,11 +51,11 @@ struct tcb *tcp;
 }

 int
-sys_write(tcp)
-struct tcb *tcp;
+sys_write(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		tprintf("%ld, ", tcp->u_arg[0]);
+		printfd(tcp, tcp->u_arg[0]);
+		tprints(", ");
 		printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
 		tprintf(", %lu", tcp->u_arg[2]);
 	}
@ -75,26 +63,24 @@ struct tcb *tcp;
 }

 #if HAVE_SYS_UIO_H
+/*
+ * data_size limits the cumulative size of printed data.
+ * Example: recvmsg returing a short read.
+ */
 void
-tprint_iov(tcp, len, addr)
-struct tcb * tcp;
-unsigned long len;
-unsigned long addr;
+tprint_iov_upto(struct tcb *tcp, unsigned long len, unsigned long addr, int decode_iov, unsigned long data_size)
 {
-#if defined(LINUX) && SUPPORTED_PERSONALITIES > 1
+#if SUPPORTED_PERSONALITIES > 1
 	union {
 		struct { u_int32_t base; u_int32_t len; } iov32;
 		struct { u_int64_t base; u_int64_t len; } iov64;
 	} iov;
 #define sizeof_iov \
-  (personality_wordsize[current_personality] == 4 \
-   ? sizeof(iov.iov32) : sizeof(iov.iov64))
+	(current_wordsize == 4 ? sizeof(iov.iov32) : sizeof(iov.iov64))
 #define iov_iov_base \
-  (personality_wordsize[current_personality] == 4 \
-   ? (u_int64_t) iov.iov32.base : iov.iov64.base)
+	(current_wordsize == 4 ? (uint64_t) iov.iov32.base : iov.iov64.base)
 #define iov_iov_len \
-  (personality_wordsize[current_personality] == 4 \
-   ? (u_int64_t) iov.iov32.len : iov.iov64.len)
+	(current_wordsize == 4 ? (uint64_t) iov.iov32.len : iov.iov64.len)
 #else
 	struct iovec iov;
 #define sizeof_iov sizeof(iov)
@ -105,7 +91,7 @@ unsigned long addr;
 	int failed = 0;

 	if (!len) {
-		tprintf("[]");
+		tprints("[]");
 		return;
 	}
 	size = len * sizeof_iov;
@ -121,24 +107,31 @@ unsigned long addr;
 	} else {
 		abbrev_end = end;
 	}
-	tprintf("[");
+	tprints("[");
 	for (cur = addr; cur < end; cur += sizeof_iov) {
 		if (cur > addr)
-			tprintf(", ");
+			tprints(", ");
 		if (cur >= abbrev_end) {
-			tprintf("...");
+			tprints("...");
 			break;
 		}
 		if (umoven(tcp, cur, sizeof_iov, (char *) &iov) < 0) {
-			tprintf("?");
+			tprints("?");
 			failed = 1;
 			break;
 		}
-		tprintf("{");
-		printstr(tcp, (long) iov_iov_base, iov_iov_len);
+		tprints("{");
+		if (decode_iov) {
+			unsigned long len = iov_iov_len;
+			if (len > data_size)
+				len = data_size;
+			data_size -= len;
+			printstr(tcp, (long) iov_iov_base, len);
+		} else
+			tprintf("%#lx", (long) iov_iov_base);
 		tprintf(", %lu}", (unsigned long)iov_iov_len);
 	}
-	tprintf("]");
+	tprints("]");
 	if (failed)
 		tprintf(" %#lx", addr);
 #undef sizeof_iov
@ -146,124 +139,43 @@ unsigned long addr;
 #undef iov_iov_len
 }

+void
+tprint_iov(struct tcb *tcp, unsigned long len, unsigned long addr, int decode_iov)
+{
+	tprint_iov_upto(tcp, len, addr, decode_iov, (unsigned long) -1L);
+}
+
 int
-sys_readv(tcp)
-struct tcb *tcp;
+sys_readv(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		tprintf("%ld, ", tcp->u_arg[0]);
+		printfd(tcp, tcp->u_arg[0]);
+		tprints(", ");
 	} else {
 		if (syserror(tcp)) {
 			tprintf("%#lx, %lu",
 					tcp->u_arg[1], tcp->u_arg[2]);
 			return 0;
 		}
-		tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1]);
+		tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], 1);
 		tprintf(", %lu", tcp->u_arg[2]);
 	}
 	return 0;
 }

 int
-sys_writev(tcp)
-struct tcb *tcp;
+sys_writev(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		tprintf("%ld, ", tcp->u_arg[0]);
-		tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1]);
+		printfd(tcp, tcp->u_arg[0]);
+		tprints(", ");
+		tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], 1);
 		tprintf(", %lu", tcp->u_arg[2]);
 	}
 	return 0;
 }
 #endif

-#if defined(SVR4)
-
-int
-sys_pread(tcp)
-struct tcb *tcp;
-{
-	if (entering(tcp)) {
-		tprintf("%ld, ", tcp->u_arg[0]);
-	} else {
-		if (syserror(tcp))
-			tprintf("%#lx", tcp->u_arg[1]);
-		else
-			printstr(tcp, tcp->u_arg[1], tcp->u_rval);
-#if UNIXWARE
-		/* off_t is signed int */
-		tprintf(", %lu, %ld", tcp->u_arg[2], tcp->u_arg[3]);
-#else
-		tprintf(", %lu, %llu", tcp->u_arg[2],
-			LONG_LONG(tcp->u_arg[3], tcp->u_arg[4]));
-#endif
-	}
-	return 0;
-}
-
-int
-sys_pwrite(tcp)
-struct tcb *tcp;
-{
-	if (entering(tcp)) {
-		tprintf("%ld, ", tcp->u_arg[0]);
-		printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-#if UNIXWARE
-		/* off_t is signed int */
-		tprintf(", %lu, %ld", tcp->u_arg[2], tcp->u_arg[3]);
-#else
-		tprintf(", %lu, %llu", tcp->u_arg[2],
-			LONG_LONG(tcp->u_arg[3], tcp->u_arg[4]));
-#endif
-	}
-	return 0;
-}
-#endif /* SVR4 */
-
-#ifdef FREEBSD
-#include <sys/types.h>
-#include <sys/socket.h>
-
-int
-sys_sendfile(tcp)
-struct tcb *tcp;
-{
-	if (entering(tcp)) {
-		tprintf("%ld, %ld, %llu, %lu", tcp->u_arg[0], tcp->u_arg[1],
-			LONG_LONG(tcp->u_arg[2], tcp->u_arg[3]),
-			tcp->u_arg[4]);
-	} else {
-		off_t offset;
-
-		if (!tcp->u_arg[5])
-			tprintf(", NULL");
-		else {
-			struct sf_hdtr hdtr;
-
-			if (umove(tcp, tcp->u_arg[5], &hdtr) < 0)
-				tprintf(", %#lx", tcp->u_arg[5]);
-			else {
-				tprintf(", { ");
-				tprint_iov(tcp, hdtr.hdr_cnt, hdtr.headers);
-				tprintf(", %u, ", hdtr.hdr_cnt);
-				tprint_iov(tcp, hdtr.trl_cnt, hdtr.trailers);
-				tprintf(", %u }", hdtr.hdr_cnt);
-			}
-		}
-		if (!tcp->u_arg[6])
-			tprintf(", NULL");
-		else if (umove(tcp, tcp->u_arg[6], &offset) < 0)
-			tprintf(", %#lx", tcp->u_arg[6]);
-		else
-			tprintf(", [%llu]", offset);
-		tprintf(", %lu", tcp->u_arg[7]);
-	}
-	return 0;
-}
-#endif /* FREEBSD */
-
-#ifdef LINUX
-
 /* The SH4 ABI does allow long longs in odd-numbered registers, but
   does not allow them to be split between registers and memory - and
   there are only four argument registers for normal functions.  As a
@ -276,130 +188,205 @@ struct tcb *tcp;
 #endif

 int
-sys_pread(tcp)
-struct tcb *tcp;
+sys_pread(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		tprintf("%ld, ", tcp->u_arg[0]);
+		printfd(tcp, tcp->u_arg[0]);
+		tprints(", ");
 	} else {
 		if (syserror(tcp))
 			tprintf("%#lx", tcp->u_arg[1]);
 		else
 			printstr(tcp, tcp->u_arg[1], tcp->u_rval);
-		ALIGN64 (tcp, PREAD_OFFSET_ARG); /* PowerPC alignment restriction */
-		tprintf(", %lu, %llu", tcp->u_arg[2],
-			*(unsigned long long *)&tcp->u_arg[PREAD_OFFSET_ARG]);
+		tprintf(", %lu, ", tcp->u_arg[2]);
+		printllval(tcp, "%llu", PREAD_OFFSET_ARG);
 	}
 	return 0;
 }

 int
-sys_pwrite(tcp)
-struct tcb *tcp;
+sys_pwrite(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		tprintf("%ld, ", tcp->u_arg[0]);
+		printfd(tcp, tcp->u_arg[0]);
+		tprints(", ");
 		printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-		ALIGN64 (tcp, PREAD_OFFSET_ARG); /* PowerPC alignment restriction */
-		tprintf(", %lu, %llu", tcp->u_arg[2],
-			*(unsigned long long *)&tcp->u_arg[PREAD_OFFSET_ARG]);
+		tprintf(", %lu, ", tcp->u_arg[2]);
+		printllval(tcp, "%llu", PREAD_OFFSET_ARG);
+	}
+	return 0;
+}
+
+#if HAVE_SYS_UIO_H
+int
+sys_preadv(struct tcb *tcp)
+{
+	if (entering(tcp)) {
+		printfd(tcp, tcp->u_arg[0]);
+		tprints(", ");
+	} else {
+		if (syserror(tcp)) {
+			tprintf("%#lx, %lu", tcp->u_arg[1], tcp->u_arg[2]);
+			return 0;
+		}
+		tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], 1);
+		tprintf(", %lu, ", tcp->u_arg[2]);
+		printllval(tcp, "%llu", PREAD_OFFSET_ARG);
 	}
 	return 0;
 }

 int
-sys_sendfile(tcp)
-struct tcb *tcp;
+sys_pwritev(struct tcb *tcp)
+{
+	if (entering(tcp)) {
+		printfd(tcp, tcp->u_arg[0]);
+		tprints(", ");
+		tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], 1);
+		tprintf(", %lu, ", tcp->u_arg[2]);
+		printllval(tcp, "%llu", PREAD_OFFSET_ARG);
+	}
+	return 0;
+}
+#endif /* HAVE_SYS_UIO_H */
+
+int
+sys_sendfile(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		off_t offset;

-		tprintf("%ld, %ld, ", tcp->u_arg[0], tcp->u_arg[1]);
+		printfd(tcp, tcp->u_arg[0]);
+		tprints(", ");
+		printfd(tcp, tcp->u_arg[1]);
+		tprints(", ");
 		if (!tcp->u_arg[2])
-			tprintf("NULL");
+			tprints("NULL");
 		else if (umove(tcp, tcp->u_arg[2], &offset) < 0)
 			tprintf("%#lx", tcp->u_arg[2]);
 		else
+#ifdef HAVE_LONG_LONG_OFF_T
+			tprintf("[%llu]", offset);
+#else
 			tprintf("[%lu]", offset);
+#endif
 		tprintf(", %lu", tcp->u_arg[3]);
 	}
 	return 0;
 }

+void
+print_loff_t(struct tcb *tcp, long addr)
+{
+	loff_t offset;
+
+	if (!addr)
+		tprints("NULL");
+	else if (umove(tcp, addr, &offset) < 0)
+		tprintf("%#lx", addr);
+	else
+		tprintf("[%llu]", (unsigned long long int) offset);
+}
+
 int
-sys_sendfile64(tcp)
-struct tcb *tcp;
+sys_sendfile64(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		loff_t offset;
-
-		tprintf("%ld, %ld, ", tcp->u_arg[0], tcp->u_arg[1]);
-		if (!tcp->u_arg[2])
-			tprintf("NULL");
-		else if (umove(tcp, tcp->u_arg[2], &offset) < 0)
-			tprintf("%#lx", tcp->u_arg[2]);
-		else
-			tprintf("[%llu]", (unsigned long long int) offset);
+		printfd(tcp, tcp->u_arg[0]);
+		tprints(", ");
+		printfd(tcp, tcp->u_arg[1]);
+		tprints(", ");
+		print_loff_t(tcp, tcp->u_arg[2]);
 		tprintf(", %lu", tcp->u_arg[3]);
 	}
 	return 0;
 }

-#endif /* LINUX */
+static const struct xlat splice_flags[] = {
+#ifdef SPLICE_F_MOVE
+	{ SPLICE_F_MOVE,     "SPLICE_F_MOVE"     },
+#endif
+#ifdef SPLICE_F_NONBLOCK
+	{ SPLICE_F_NONBLOCK, "SPLICE_F_NONBLOCK" },
+#endif
+#ifdef SPLICE_F_MORE
+	{ SPLICE_F_MORE,     "SPLICE_F_MORE"     },
+#endif
+#ifdef SPLICE_F_GIFT
+	{ SPLICE_F_GIFT,     "SPLICE_F_GIFT"     },
+#endif
+	{ 0,                 NULL                },
+};

-#if _LFS64_LARGEFILE || HAVE_LONG_LONG_OFF_T
 int
-sys_pread64(tcp)
-struct tcb *tcp;
+sys_tee(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		tprintf("%ld, ", tcp->u_arg[0]);
-	} else {
-		ALIGN64 (tcp, 3);
-		if (syserror(tcp))
-			tprintf("%#lx", tcp->u_arg[1]);
-		else
-			printstr(tcp, tcp->u_arg[1], tcp->u_rval);
-#ifdef MIPS_LINUXN32
-		tprintf(", %lu, %#llx", tcp->u_arg[2], tcp->ext_arg[3]);
-#else
-		tprintf(", %lu, %#llx", tcp->u_arg[2],
-			LONG_LONG(tcp->u_arg[3], tcp->u_arg[4]));
-#endif
+		/* int fd_in */
+		printfd(tcp, tcp->u_arg[0]);
+		tprints(", ");
+		/* int fd_out */
+		printfd(tcp, tcp->u_arg[1]);
+		tprints(", ");
+		/* size_t len */
+		tprintf("%lu, ", tcp->u_arg[2]);
+		/* unsigned int flags */
+		printflags(splice_flags, tcp->u_arg[3], "SPLICE_F_???");
 	}
 	return 0;
 }

 int
-sys_pwrite64(tcp)
-struct tcb *tcp;
+sys_splice(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		ALIGN64 (tcp, 3);
-		tprintf("%ld, ", tcp->u_arg[0]);
-		printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-#ifdef MIPS_LINUXN32
-		tprintf(", %lu, %#llx", tcp->u_arg[2], tcp->ext_arg[3]);
-#else
-		tprintf(", %lu, %#llx", tcp->u_arg[2],
-			LONG_LONG(tcp->u_arg[3], tcp->u_arg[4]));
-#endif
+		/* int fd_in */
+		printfd(tcp, tcp->u_arg[0]);
+		tprints(", ");
+		/* loff_t *off_in */
+		print_loff_t(tcp, tcp->u_arg[1]);
+		tprints(", ");
+		/* int fd_out */
+		printfd(tcp, tcp->u_arg[2]);
+		tprints(", ");
+		/* loff_t *off_out */
+		print_loff_t(tcp, tcp->u_arg[3]);
+		tprints(", ");
+		/* size_t len */
+		tprintf("%lu, ", tcp->u_arg[4]);
+		/* unsigned int flags */
+		printflags(splice_flags, tcp->u_arg[5], "SPLICE_F_???");
 	}
 	return 0;
 }
-#endif

 int
-sys_ioctl(tcp)
-struct tcb *tcp;
+sys_vmsplice(struct tcb *tcp)
+{
+	if (entering(tcp)) {
+		/* int fd */
+		printfd(tcp, tcp->u_arg[0]);
+		tprints(", ");
+		/* const struct iovec *iov, unsigned long nr_segs */
+		tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], 1);
+		tprintf(", %lu, ", tcp->u_arg[2]);
+		/* unsigned int flags */
+		printflags(splice_flags, tcp->u_arg[3], "SPLICE_F_???");
+	}
+	return 0;
+}
+
+int
+sys_ioctl(struct tcb *tcp)
 {
 	const struct ioctlent *iop;

 	if (entering(tcp)) {
-		tprintf("%ld, ", tcp->u_arg[0]);
+		printfd(tcp, tcp->u_arg[0]);
+		tprints(", ");
 		iop = ioctl_lookup(tcp->u_arg[1]);
 		if (iop) {
-			tprintf("%s", iop->symbol);
+			tprints(iop->symbol);
 			while ((iop = ioctl_next_match(iop)))
 				tprintf(" or %s", iop->symbol);
 		} else
@ -407,8 +394,8 @@ struct tcb *tcp;
 		ioctl_decode(tcp, tcp->u_arg[1], tcp->u_arg[2]);
 	}
 	else {
-		int ret;
-		if (!(ret = ioctl_decode(tcp, tcp->u_arg[1], tcp->u_arg[2])))
+		int ret = ioctl_decode(tcp, tcp->u_arg[1], tcp->u_arg[2]);
+		if (!ret)
 			tprintf(", %#lx", tcp->u_arg[2]);
 		else
 			return ret - 1;
--- a/ioctl.c
+++ b/ioctl.c
@ -26,135 +26,72 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id$
 */

 #include "defs.h"
-
-const struct ioctlent ioctlent0[] = {
-/*
- * `ioctlent.h' may be generated from `ioctlent.raw' by the auxiliary
- * program `ioctlsort', such that the list is sorted by the `code' field.
- * This has the side-effect of resolving the _IO.. macros into
- * plain integers, eliminating the need to include here everything
- * in "/usr/include" .
- */
-#include "ioctlent.h"
-};
-
-#ifdef LINUX
 #include <asm/ioctl.h>
-#endif
-
-const int nioctlents0 = sizeof ioctlent0 / sizeof ioctlent0[0];
-
-#if SUPPORTED_PERSONALITIES >= 2
-const struct ioctlent ioctlent1[] = {
-#include "ioctlent1.h"
-};
-
-const int nioctlents1 = sizeof ioctlent1 / sizeof ioctlent1[0];
-#endif /* SUPPORTED_PERSONALITIES >= 2 */
-
-#if SUPPORTED_PERSONALITIES >= 3
-const struct ioctlent ioctlent2[] = {
-#include "ioctlent2.h"
-};
-
-const int nioctlents2 = sizeof ioctlent2 / sizeof ioctlent2[0];
-#endif /* SUPPORTED_PERSONALITIES >= 3 */
-
-const struct ioctlent *ioctlent;
-int nioctlents;

 static int
-compare(a, b)
-const void *a;
-const void *b;
+compare(const void *a, const void *b)
 {
-	unsigned long code1 = ((struct ioctlent *) a)->code;
+	unsigned long code1 = (long) a;
 	unsigned long code2 = ((struct ioctlent *) b)->code;
 	return (code1 > code2) ? 1 : (code1 < code2) ? -1 : 0;
 }

 const struct ioctlent *
-ioctl_lookup(code)
-long code;
+ioctl_lookup(long code)
 {
-	struct ioctlent *iop, ioent;
+	struct ioctlent *iop;

-	ioent.code = code;
-#ifdef LINUX
-	ioent.code &= (_IOC_NRMASK<<_IOC_NRSHIFT) | (_IOC_TYPEMASK<<_IOC_TYPESHIFT);
-#endif
-	iop = (struct ioctlent *) bsearch((char *) &ioent, (char *) ioctlent,
-			nioctlents, sizeof(struct ioctlent), compare);
-	while (iop > ioctlent)
-		if ((--iop)->code != ioent.code) {
+	code &= (_IOC_NRMASK<<_IOC_NRSHIFT) | (_IOC_TYPEMASK<<_IOC_TYPESHIFT);
+	iop = bsearch((void*)code, ioctlent,
+			nioctlents, sizeof(ioctlent[0]), compare);
+	while (iop > ioctlent) {
+		iop--;
+		if (iop->code != code) {
 			iop++;
 			break;
 		}
+	}
 	return iop;
 }

 const struct ioctlent *
-ioctl_next_match(iop)
-const struct ioctlent *iop;
+ioctl_next_match(const struct ioctlent *iop)
 {
 	long code;

-	code = (iop++)->code;
+	code = iop->code;
+	iop++;
 	if (iop < ioctlent + nioctlents && iop->code == code)
 		return iop;
 	return NULL;
 }

 int
-ioctl_decode(tcp, code, arg)
-struct tcb *tcp;
-long code, arg;
+ioctl_decode(struct tcb *tcp, long code, long arg)
 {
 	switch ((code >> 8) & 0xff) {
-#ifdef LINUX
 #if defined(ALPHA) || defined(POWERPC)
 	case 'f': case 't': case 'T':
 #else /* !ALPHA */
 	case 0x54:
 #endif /* !ALPHA */
-#else /* !LINUX */
-	case 'f': case 't': case 'T':
-#endif /* !LINUX */
 		return term_ioctl(tcp, code, arg);
-#ifdef LINUX
 	case 0x89:
-#else /* !LINUX */
-	case 'r': case 's': case 'i':
-#ifndef FREEBSD
-	case 'p':
-#endif
-#endif /* !LINUX */
 		return sock_ioctl(tcp, code, arg);
-#ifdef USE_PROCFS
-#ifndef HAVE_MP_PROCFS
-#ifndef FREEBSD
-	case 'q':
-#else
-	case 'p':
-#endif
-		return proc_ioctl(tcp, code, arg);
-#endif
-#endif /* USE_PROCFS */
-#ifdef HAVE_SYS_STREAM_H
-	case 'S':
-		return stream_ioctl(tcp, code, arg);
-#endif /* HAVE_SYS_STREAM_H */
-#ifdef LINUX
 	case 'p':
 		return rtc_ioctl(tcp, code, arg);
+	case 0x03:
+	case 0x12:
+		return block_ioctl(tcp, code, arg);
 	case 0x22:
 		return scsi_ioctl(tcp, code, arg);
-#endif
+	case 'L':
+		return loop_ioctl(tcp, code, arg);
+	case 'M':
+		return mtd_ioctl(tcp, code, arg);
 	default:
 		break;
 	}
--- a/ioctlsort.c
+++ b/ioctlsort.c
@ -24,20 +24,16 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id$
 */

-
 #include <stdio.h>
-
 #ifdef STDC_HEADERS
-#include <stdlib.h>
+# include <stdlib.h>
 #endif

 struct ioctlent {
-	char *doth;
-	char *symbol;
+	const char *doth;
+	const char *symbol;
 	unsigned long code;
 };

@ -46,9 +42,7 @@ struct ioctlent {
 int nioctlents = sizeof ioctlent / sizeof ioctlent[0];

 int
-compare(a, b)
-const void *a;
-const void *b;
+compare(const void *a, const void *b)
 {
 	unsigned long code1 = ((struct ioctlent *) a)->code;
 	unsigned long code2 = ((struct ioctlent *) b)->code;
@ -56,9 +50,7 @@ const void *b;
 }

 int
-main(argc, argv)
-int argc;
-char *argv[];
+main(int argc, const char *argv[])
 {
 	int i;

--- a/ipc.c
+++ b/ipc.c
@ -26,18 +26,12 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id$
 */

 #include "defs.h"
-
-#if defined(LINUX) || defined(SUNOS4) || defined(FREEBSD)
-
-# ifdef HAVE_MQUEUE_H
-#  include <mqueue.h>
-# endif
-
+#ifdef HAVE_MQUEUE_H
+# include <mqueue.h>
+#endif
 #include <fcntl.h>
 #include <sys/ipc.h>
 #include <sys/sem.h>
@ -63,7 +57,7 @@
 #define SEM_INFO 19
 #endif

-#if defined LINUX && !defined IPC_64
+#if !defined IPC_64
 # define IPC_64 0x100
 #endif

@ -73,11 +67,9 @@ static const struct xlat msgctl_flags[] = {
 	{ IPC_RMID,	"IPC_RMID"	},
 	{ IPC_SET,	"IPC_SET"	},
 	{ IPC_STAT,	"IPC_STAT"	},
-#ifdef LINUX
 	{ IPC_INFO,	"IPC_INFO"	},
 	{ MSG_STAT,	"MSG_STAT"	},
 	{ MSG_INFO,	"MSG_INFO"	},
-#endif /* LINUX */
 	{ 0,		NULL		},
 };

@ -85,11 +77,9 @@ static const struct xlat semctl_flags[] = {
 	{ IPC_RMID,	"IPC_RMID"	},
 	{ IPC_SET,	"IPC_SET"	},
 	{ IPC_STAT,	"IPC_STAT"	},
-#ifdef LINUX
 	{ IPC_INFO,	"IPC_INFO"	},
 	{ SEM_STAT,	"SEM_STAT"	},
 	{ SEM_INFO,	"SEM_INFO"	},
-#endif /* LINUX */
 	{ GETPID,	"GETPID"	},
 	{ GETVAL,	"GETVAL"	},
 	{ GETALL,	"GETALL"	},
@ -104,11 +94,9 @@ static const struct xlat shmctl_flags[] = {
 	{ IPC_RMID,	"IPC_RMID"	},
 	{ IPC_SET,	"IPC_SET"	},
 	{ IPC_STAT,	"IPC_STAT"	},
-#ifdef LINUX
 	{ IPC_INFO,	"IPC_INFO"	},
 	{ SHM_STAT,	"SHM_STAT"	},
 	{ SHM_INFO,	"SHM_INFO"	},
-#endif /* LINUX */
 #ifdef SHM_LOCK
 	{ SHM_LOCK,	"SHM_LOCK"	},
 #endif
@ -135,9 +123,7 @@ static const struct xlat shm_resource_flags[] = {
 };

 static const struct xlat shm_flags[] = {
-#ifdef LINUX
 	{ SHM_REMAP,	"SHM_REMAP"	},
-#endif /* LINUX */
 	{ SHM_RDONLY,	"SHM_RDONLY"	},
 	{ SHM_RND,	"SHM_RND"	},
 	{ 0,		NULL		},
@ -145,9 +131,7 @@ static const struct xlat shm_flags[] = {

 static const struct xlat msg_flags[] = {
 	{ MSG_NOERROR,	"MSG_NOERROR"	},
-#ifdef LINUX
 	{ MSG_EXCEPT,	"MSG_EXCEPT"	},
-#endif /* LINUX */
 	{ IPC_NOWAIT,	"IPC_NOWAIT"	},
 	{ 0,		NULL		},
 };
@ -158,17 +142,16 @@ static const struct xlat semop_flags[] = {
 	{ 0,		NULL		},
 };

-int sys_msgget(tcp)
-struct tcb *tcp;
+int sys_msgget(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		if (tcp->u_arg[0])
 			tprintf("%#lx", tcp->u_arg[0]);
 		else
-			tprintf("IPC_PRIVATE");
-		tprintf(", ");
+			tprints("IPC_PRIVATE");
+		tprints(", ");
 		if (printflags(resource_flags, tcp->u_arg[1] & ~0777, NULL) != 0)
-			tprintf("|");
+			tprints("|");
 		tprintf("%#lo", tcp->u_arg[1] & 0777);
 	}
 	return 0;
@ -176,32 +159,28 @@ struct tcb *tcp;

 #ifdef IPC_64
 # define PRINTCTL(flagset, arg, dflt) \
-	if ((arg) & IPC_64) tprintf("IPC_64|"); \
+	if ((arg) & IPC_64) tprints("IPC_64|"); \
 	printxval((flagset), (arg) &~ IPC_64, dflt)
 #else
 # define PRINTCTL printxval
 #endif

 static int
-indirect_ipccall(tcp)
-struct tcb *tcp;
+indirect_ipccall(struct tcb *tcp)
 {
-#ifdef LINUX
 #ifdef X86_64
-	return current_personality > 0;
+	return current_personality == 1;
 #endif
 #if defined IA64
 	return tcp->scno < 1024; /* ia32 emulation syscalls are low */
 #endif
-#if !defined MIPS && !defined HPPA
-	return 1;
-#endif
-#endif	/* LINUX */
+#if defined(ALPHA) || defined(MIPS) || defined(HPPA) || defined(__ARM_EABI__)
 	return 0;
+#endif
+	return 1;
 }

-int sys_msgctl(tcp)
-struct tcb *tcp;
+int sys_msgctl(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		tprintf("%lu, ", tcp->u_arg[0]);
@ -212,7 +191,8 @@ struct tcb *tcp;
 }

 static void
-tprint_msgsnd(struct tcb *tcp, long addr, unsigned long count)
+tprint_msgsnd(struct tcb *tcp, long addr, unsigned long count,
+	      unsigned long flags)
 {
 	long mtype;

@ -221,56 +201,64 @@ tprint_msgsnd(struct tcb *tcp, long addr, unsigned long count)
 	} else {
 		tprintf("{%lu, ", mtype);
 		printstr(tcp, addr + sizeof(mtype), count);
-		tprintf("}");
+		tprints("}");
 	}
 	tprintf(", %lu, ", count);
-	printflags(msg_flags, tcp->u_arg[3], "MSG_???");
+	printflags(msg_flags, flags, "MSG_???");
 }

 int sys_msgsnd(struct tcb *tcp)
 {
 	if (entering(tcp)) {
-		tprintf("%lu, ", tcp->u_arg[0]);
+		tprintf("%d, ", (int) tcp->u_arg[0]);
 		if (indirect_ipccall(tcp)) {
-			tprint_msgsnd(tcp, tcp->u_arg[3], tcp->u_arg[1]);
+			tprint_msgsnd(tcp, tcp->u_arg[3], tcp->u_arg[1],
+				      tcp->u_arg[2]);
 		} else {
-			tprint_msgsnd(tcp, tcp->u_arg[1], tcp->u_arg[2]);
+			tprint_msgsnd(tcp, tcp->u_arg[1], tcp->u_arg[2],
+				      tcp->u_arg[3]);
 		}
 	}
 	return 0;
 }

-int sys_msgrcv(tcp)
-struct tcb *tcp;
+static void
+tprint_msgrcv(struct tcb *tcp, long addr, unsigned long count, long msgtyp)
 {
 	long mtype;

-	if (entering(tcp)) {
-		tprintf("%lu, ", tcp->u_arg[0]);
+	if (syserror(tcp) || umove(tcp, addr, &mtype) < 0) {
+		tprintf("%#lx", addr);
+	} else {
+		tprintf("{%lu, ", mtype);
+		printstr(tcp, addr + sizeof(mtype), count);
+		tprints("}");
+	}
+	tprintf(", %lu, %ld, ", count, msgtyp);
+}
+
+int sys_msgrcv(struct tcb *tcp)
+{
+	if (entering(tcp)) {
+		tprintf("%d, ", (int) tcp->u_arg[0]);
 	} else {
-		tprintf("%lu", tcp->u_arg[0]);
 		if (indirect_ipccall(tcp)) {
 			struct ipc_wrapper {
 				struct msgbuf *msgp;
 				long msgtyp;
 			} tmp;
-			umove(tcp, tcp->u_arg[3], &tmp);
-			umove(tcp, (long) tmp.msgp, &mtype);
-			tprintf(", {%lu, ", mtype);
-			printstr(tcp, (long) (tmp.msgp) + sizeof(long),
-				 tcp->u_arg[1]);
-			tprintf("}, %lu", tcp->u_arg[1]);
-			tprintf(", %ld", tmp.msgtyp);
-			tprintf(", ");
+
+			if (umove(tcp, tcp->u_arg[3], &tmp) < 0) {
+				tprintf("%#lx, %lu, ",
+					tcp->u_arg[3], tcp->u_arg[1]);
+			} else {
+				tprint_msgrcv(tcp, (long) tmp.msgp,
+					tcp->u_arg[1], tmp.msgtyp);
+			}
 			printflags(msg_flags, tcp->u_arg[2], "MSG_???");
 		} else {
-			umove(tcp, tcp->u_arg[1], &mtype);
-			tprintf("{%lu, ", mtype);
-			printstr(tcp, tcp->u_arg[1] + sizeof(long),
-				 tcp->u_arg[2]);
-			tprintf("}, %lu", tcp->u_arg[2]);
-			tprintf(", %ld", tcp->u_arg[3]);
-			tprintf(", ");
+			tprint_msgrcv(tcp, tcp->u_arg[1],
+				tcp->u_arg[2], tcp->u_arg[3]);
 			printflags(msg_flags, tcp->u_arg[4], "MSG_???");
 		}
 	}
@ -292,13 +280,13 @@ tprint_sembuf(struct tcb *tcp, long addr, unsigned long count)
 		return;
 	}

-	for(i = 0; i < max_count; ++i) {
+	for (i = 0; i < max_count; ++i) {
 		struct sembuf sb;
 		if (i)
-			tprintf(", ");
+			tprints(", ");
 		if (umove(tcp, addr + i * sizeof(struct sembuf), &sb) < 0) {
 			if (i) {
-				tprintf("{???}");
+				tprints("{???}");
 				break;
 			} else {
 				tprintf("%#lx, %lu", addr, count);
@ -306,15 +294,15 @@ tprint_sembuf(struct tcb *tcp, long addr, unsigned long count)
 			}
 		} else {
 			if (!i)
-				tprintf("{");
+				tprints("{");
 			tprintf("{%u, %d, ", sb.sem_num, sb.sem_op);
 			printflags(semop_flags, sb.sem_flg, "SEM_???");
-			tprintf("}");
+			tprints("}");
 		}
 	}

 	if (i < max_count || max_count < count)
-		tprintf(", ...");
+		tprints(", ...");

 	tprintf("}, %lu", count);
 }
@ -332,44 +320,44 @@ int sys_semop(struct tcb *tcp)
 	return 0;
 }

-#ifdef LINUX
 int sys_semtimedop(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		tprintf("%lu, ", tcp->u_arg[0]);
 		if (indirect_ipccall(tcp)) {
 			tprint_sembuf(tcp, tcp->u_arg[3], tcp->u_arg[1]);
-			tprintf(", ");
+			tprints(", ");
+#if defined(S390)
+			printtv(tcp, tcp->u_arg[2]);
+#else
 			printtv(tcp, tcp->u_arg[5]);
+#endif
 		} else {
 			tprint_sembuf(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-			tprintf(", ");
+			tprints(", ");
 			printtv(tcp, tcp->u_arg[3]);
 		}
 	}
 	return 0;
 }
-#endif

-int sys_semget(tcp)
-struct tcb *tcp;
+int sys_semget(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		if (tcp->u_arg[0])
 			tprintf("%#lx", tcp->u_arg[0]);
 		else
-			tprintf("IPC_PRIVATE");
+			tprints("IPC_PRIVATE");
 		tprintf(", %lu", tcp->u_arg[1]);
-		tprintf(", ");
+		tprints(", ");
 		if (printflags(resource_flags, tcp->u_arg[2] & ~0777, NULL) != 0)
-			tprintf("|");
+			tprints("|");
 		tprintf("%#lo", tcp->u_arg[2] & 0777);
 	}
 	return 0;
 }

-int sys_semctl(tcp)
-struct tcb *tcp;
+int sys_semctl(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		tprintf("%lu", tcp->u_arg[0]);
@ -380,25 +368,23 @@ struct tcb *tcp;
 	return 0;
 }

-int sys_shmget(tcp)
-struct tcb *tcp;
+int sys_shmget(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		if (tcp->u_arg[0])
 			tprintf("%#lx", tcp->u_arg[0]);
 		else
-			tprintf("IPC_PRIVATE");
+			tprints("IPC_PRIVATE");
 		tprintf(", %lu", tcp->u_arg[1]);
-		tprintf(", ");
+		tprints(", ");
 		if (printflags(shm_resource_flags, tcp->u_arg[2] & ~0777, NULL) != 0)
-			tprintf("|");
+			tprints("|");
 		tprintf("%#lo", tcp->u_arg[2] & 0777);
 	}
 	return 0;
 }

-int sys_shmctl(tcp)
-struct tcb *tcp;
+int sys_shmctl(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		tprintf("%lu, ", tcp->u_arg[0]);
@ -412,39 +398,33 @@ struct tcb *tcp;
 	return 0;
 }

-int sys_shmat(tcp)
-struct tcb *tcp;
+int sys_shmat(struct tcb *tcp)
 {
-#ifdef LINUX
-	unsigned long raddr;
-#endif /* LINUX */
-
 	if (exiting(tcp)) {
 		tprintf("%lu", tcp->u_arg[0]);
 		if (indirect_ipccall(tcp)) {
 			tprintf(", %#lx", tcp->u_arg[3]);
-			tprintf(", ");
+			tprints(", ");
 			printflags(shm_flags, tcp->u_arg[1], "SHM_???");
 		} else {
 			tprintf(", %#lx", tcp->u_arg[1]);
-			tprintf(", ");
+			tprints(", ");
 			printflags(shm_flags, tcp->u_arg[2], "SHM_???");
 		}
 		if (syserror(tcp))
 			return 0;
-/* HPPA does not use an IPC multiplexer on Linux.  */
-#if defined(LINUX) && !defined(HPPA)
-		if (umove(tcp, tcp->u_arg[2], &raddr) < 0)
-			return RVAL_NONE;
-		tcp->u_rval = raddr;
-#endif /* LINUX */
+		if (indirect_ipccall(tcp)) {
+			unsigned long raddr;
+			if (umove(tcp, tcp->u_arg[2], &raddr) < 0)
+				return RVAL_NONE;
+			tcp->u_rval = raddr;
+		}
 		return RVAL_HEX;
 	}
 	return 0;
 }

-int sys_shmdt(tcp)
-struct tcb *tcp;
+int sys_shmdt(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		if (indirect_ipccall(tcp)) {
@ -456,15 +436,12 @@ struct tcb *tcp;
 	return 0;
 }

-#endif /* defined(LINUX) || defined(SUNOS4) || defined(FREEBSD) */
-
-#ifdef LINUX
 int
 sys_mq_open(struct tcb *tcp)
 {
 	if (entering(tcp)) {
 		printpath(tcp, tcp->u_arg[0]);
-		tprintf(", ");
+		tprints(", ");
 		/* flags */
 		tprint_open_modes(tcp->u_arg[1]);
 		if (tcp->u_arg[1] & O_CREAT) {
@ -475,10 +452,11 @@ sys_mq_open(struct tcb *tcp)
 			/* mode */
 			tprintf(", %#lo, ", tcp->u_arg[2]);
 			if (umove(tcp, tcp->u_arg[3], &attr) < 0)
-				tprintf("{ ??? }");
+				tprints("{ ??? }");
 			else
 				tprintf("{mq_maxmsg=%ld, mq_msgsize=%ld}",
-					attr.mq_maxmsg, attr.mq_msgsize);
+					(long) attr.mq_maxmsg,
+					(long) attr.mq_msgsize);
 # endif
 		}
 	}
@ -524,20 +502,21 @@ static void
 printmqattr(struct tcb *tcp, long addr)
 {
 	if (addr == 0)
-		tprintf("NULL");
+		tprints("NULL");
 	else {
 # ifndef HAVE_MQUEUE_H
 		tprintf("%#lx", addr);
 # else
 		struct mq_attr attr;
 		if (umove(tcp, addr, &attr) < 0) {
-			tprintf("{...}");
+			tprints("{...}");
 			return;
 		}
-		tprintf("{mq_flags=");
+		tprints("{mq_flags=");
 		tprint_open_modes(attr.mq_flags);
 		tprintf(", mq_maxmsg=%ld, mq_msgsize=%ld, mq_curmsg=%ld}",
-			attr.mq_maxmsg, attr.mq_msgsize, attr.mq_curmsgs);
+			(long) attr.mq_maxmsg, (long) attr.mq_msgsize,
+			(long) attr.mq_curmsgs);
 # endif
 	}
 }
@ -548,9 +527,14 @@ sys_mq_getsetattr(struct tcb *tcp)
 	if (entering(tcp)) {
 		tprintf("%ld, ", tcp->u_arg[0]);
 		printmqattr(tcp, tcp->u_arg[1]);
-		tprintf(", ");
+		tprints(", ");
 	} else
 		printmqattr(tcp, tcp->u_arg[2]);
 	return 0;
 }
-#endif
+
+int
+sys_ipc(struct tcb *tcp)
+{
+	return printargs(tcp);
+}
--- a/linux/.cvsignore
+++ b/linux/.cvsignore
@ -1,3 +0,0 @@
-Makefile
-ioctldefs.h
-ioctls.h
--- a/linux/alpha/.cvsignore
+++ b/linux/alpha/.cvsignore
@ -1 +0,0 @@
-Makefile
--- a/linux/alpha/ioctlent.h
+++ b/linux/alpha/ioctlent.h
@ -1,852 +0,0 @@
-	{"linux/fs.h",	"FIBMAP",	0x1},
-	{"linux/fs.h",	"FIGETBSZ",	0x2},
-	{"linux/fd.h",	"FDGETPRM",	0x204},
-	{"linux/fd.h",	"FDGETMAXERRS",	0x20e},
-	{"linux/fd.h",	"FDGETDRVTYP",	0x20f},
-	{"linux/fd.h",	"FDGETDRVPRM",	0x211},
-	{"linux/fd.h",	"FDGETDRVSTAT",	0x212},
-	{"linux/fd.h",	"FDPOLLDRVSTAT",	0x213},
-	{"linux/fd.h",	"FDGETFDCSTAT",	0x215},
-	{"linux/fd.h",	"FDWERRORGET",	0x217},
-	{"linux/fd.h",	"FDCLRPRM",	0x241},
-	{"linux/fd.h",	"FDSETPRM",	0x242},
-	{"linux/fd.h",	"FDDEFPRM",	0x243},
-	{"linux/fd.h",	"FDMSGON",	0x245},
-	{"linux/fd.h",	"FDMSGOFF",	0x246},
-	{"linux/fd.h",	"FDFMTBEG",	0x247},
-	{"linux/fd.h",	"FDFMTTRK",	0x248},
-	{"linux/fd.h",	"FDFMTEND",	0x249},
-	{"linux/fd.h",	"FDSETEMSGTRESH",	0x24a},
-	{"linux/fd.h",	"FDFLUSH",	0x24b},
-	{"linux/fd.h",	"FDSETMAXERRS",	0x24c},
-	{"linux/fd.h",	"FDRESET",	0x254},
-	{"linux/fd.h",	"FDWERRORCLR",	0x256},
-	{"linux/fd.h",	"FDRAWCMD",	0x258},
-	{"linux/fd.h",	"FDTWADDLE",	0x259},
-	{"linux/fd.h",	"FDEJECT",	0x25a},
-	{"linux/fd.h",	"FDSETDRVPRM",	0x290},
-	{"linux/umsdos_fs.h",	"UMSDOS_READDIR_DOS",	0x4d2},
-	{"linux/umsdos_fs.h",	"UMSDOS_UNLINK_DOS",	0x4d3},
-	{"linux/umsdos_fs.h",	"UMSDOS_RMDIR_DOS",	0x4d4},
-	{"linux/umsdos_fs.h",	"UMSDOS_STAT_DOS",	0x4d5},
-	{"linux/umsdos_fs.h",	"UMSDOS_CREAT_EMD",	0x4d6},
-	{"linux/umsdos_fs.h",	"UMSDOS_UNLINK_EMD",	0x4d7},
-	{"linux/umsdos_fs.h",	"UMSDOS_READDIR_EMD",	0x4d8},
-	{"linux/umsdos_fs.h",	"UMSDOS_GETVERSION",	0x4d9},
-	{"linux/umsdos_fs.h",	"UMSDOS_INIT_EMD",	0x4da},
-	{"linux/umsdos_fs.h",	"UMSDOS_DOS_SETUP",	0x4db},
-	{"linux/umsdos_fs.h",	"UMSDOS_RENAME_DOS",	0x4dc},
-	{"linux/fs.h",	"BLKROSET",	0x125d},
-	{"linux/fs.h",	"BLKROGET",	0x125e},
-	{"linux/fs.h",	"BLKRRPART",	0x125f},
-	{"linux/fs.h",	"BLKGETSIZE",	0x1260},
-	{"linux/fs.h",	"BLKFLSBUF",	0x1261},
-	{"linux/fs.h",	"BLKRASET",	0x1262},
-	{"linux/fs.h",	"BLKRAGET",	0x1263},
-	{"linux/fs.h",	"BLKFRASET",	0x1264},
-	{"linux/fs.h",	"BLKFRAGET",	0x1265},
-	{"linux/fs.h",	"BLKSECTSET",	0x1266},
-	{"linux/fs.h",	"BLKSECTGET",	0x1267},
-	{"linux/fs.h",	"BLKSSZGET",	0x1268},
-	{"linux/blkpg.h",	"BLKPG",	0x1269},
-	{"linux/fs.h",	"BLKPG",	0x1269},
-	{"linux/elevator.h",	"BLKELVGET",	0x126a},
-	{"linux/fs.h",	"BLKELVGET",	0x126a},
-	{"linux/elevator.h",	"BLKELVSET",	0x126b},
-	{"linux/fs.h",	"BLKELVSET",	0x126b},
-	{"linux/fs.h",	"BLKBSZGET",	0x1270},
-	{"linux/fs.h",	"BLKBSZSET",	0x1271},
-	{"linux/fs.h",	"BLKGETSIZE64",	0x1272},
-	{"linux/agpgart.h",	"AGPIOC_INFO",	0x4100},
-	{"linux/agpgart.h",	"AGPIOC_ACQUIRE",	0x4101},
-	{"linux/apm_bios.h",	"APM_IOC_STANDBY",	0x4101},
-	{"linux/agpgart.h",	"AGPIOC_RELEASE",	0x4102},
-	{"linux/apm_bios.h",	"APM_IOC_SUSPEND",	0x4102},
-	{"linux/agpgart.h",	"AGPIOC_SETUP",	0x4103},
-	{"linux/agpgart.h",	"AGPIOC_RESERVE",	0x4104},
-	{"linux/agpgart.h",	"AGPIOC_PROTECT",	0x4105},
-	{"linux/agpgart.h",	"AGPIOC_ALLOCATE",	0x4106},
-	{"linux/agpgart.h",	"AGPIOC_DEALLOCATE",	0x4107},
-	{"linux/agpgart.h",	"AGPIOC_BIND",	0x4108},
-	{"linux/agpgart.h",	"AGPIOC_UNBIND",	0x4109},
-	{"linux/pmu.h",	"PMU_IOC_SLEEP",	0x4200},
-	{"linux/cciss_ioctl.h",	"CCISS_GETPCIINFO",	0x4201},
-	{"linux/pmu.h",	"PMU_IOC_GET_BACKLIGHT",	0x4201},
-	{"linux/cciss_ioctl.h",	"CCISS_GETINTINFO",	0x4202},
-	{"linux/pmu.h",	"PMU_IOC_SET_BACKLIGHT",	0x4202},
-	{"linux/cciss_ioctl.h",	"CCISS_SETINTINFO",	0x4203},
-	{"linux/pmu.h",	"PMU_IOC_GET_MODEL",	0x4203},
-	{"linux/cciss_ioctl.h",	"CCISS_GETNODENAME",	0x4204},
-	{"linux/pmu.h",	"PMU_IOC_HAS_ADB",	0x4204},
-	{"linux/cciss_ioctl.h",	"CCISS_SETNODENAME",	0x4205},
-	{"linux/pmu.h",	"PMU_IOC_CAN_SLEEP",	0x4205},
-	{"linux/cciss_ioctl.h",	"CCISS_GETHEARTBEAT",	0x4206},
-	{"linux/cciss_ioctl.h",	"CCISS_GETBUSTYPES",	0x4207},
-	{"linux/cciss_ioctl.h",	"CCISS_GETFIRMVER",	0x4208},
-	{"linux/cciss_ioctl.h",	"CCISS_GETDRIVVER",	0x4209},
-	{"linux/cciss_ioctl.h",	"CCISS_REVALIDVOLS",	0x420a},
-	{"linux/cciss_ioctl.h",	"CCISS_PASSTHRU",	0x420b},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RESET",	0x4300},
-	{"linux/capi.h",	"CAPI_REGISTER",	0x4301},
-	{"linux/soundcard.h",	"SNDCTL_COPR_LOAD",	0x4301},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RDATA",	0x4302},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RCODE",	0x4303},
-	{"linux/soundcard.h",	"SNDCTL_COPR_WDATA",	0x4304},
-	{"linux/soundcard.h",	"SNDCTL_COPR_WCODE",	0x4305},
-	{"linux/capi.h",	"CAPI_GET_MANUFACTURER",	0x4306},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RUN",	0x4306},
-	{"linux/capi.h",	"CAPI_GET_VERSION",	0x4307},
-	{"linux/soundcard.h",	"SNDCTL_COPR_HALT",	0x4307},
-	{"linux/capi.h",	"CAPI_GET_SERIAL",	0x4308},
-	{"linux/soundcard.h",	"SNDCTL_COPR_SENDMSG",	0x4308},
-	{"linux/capi.h",	"CAPI_GET_PROFILE",	0x4309},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RCVMSG",	0x4309},
-	{"linux/capi.h",	"CAPI_MANUFACTURER_CMD",	0x4320},
-	{"linux/capi.h",	"CAPI_GET_ERRCODE",	0x4321},
-	{"linux/capi.h",	"CAPI_INSTALLED",	0x4322},
-	{"linux/capi.h",	"CAPI_GET_FLAGS",	0x4323},
-	{"linux/capi.h",	"CAPI_SET_FLAGS",	0x4324},
-	{"linux/capi.h",	"CAPI_CLR_FLAGS",	0x4325},
-	{"linux/capi.h",	"CAPI_NCCI_OPENCOUNT",	0x4326},
-	{"linux/capi.h",	"CAPI_NCCI_GETUNIT",	0x4327},
-	{"linux/input.h",	"EVIOCGVERSION",	0x4501},
-	{"linux/input.h",	"EVIOCGID",	0x4502},
-	{"linux/input.h",	"EVIOCGREP",	0x4503},
-	{"linux/input.h",	"EVIOCSREP",	0x4503},
-	{"linux/input.h",	"EVIOCGKEYCODE",	0x4504},
-	{"linux/input.h",	"EVIOCSKEYCODE",	0x4504},
-	{"linux/input.h",	"EVIOCGKEY",	0x4505},
-	{"linux/input.h",	"EVIOCGBUS",	0x4507},
-	{"linux/input.h",	"EVIOCRMFF",	0x4581},
-	{"linux/input.h",	"EVIOCSGAIN",	0x4582},
-	{"linux/input.h",	"EVIOCSAUTOCENTER",	0x4583},
-	{"linux/input.h",	"EVIOCGEFFECTS",	0x4584},
-	{"linux/fb.h",	"FBIOGET_VBLANK",	0x4612},
-	{"linux/hiddev.h",	"HIDIOCGVERSION",	0x4801},
-	{"linux/hiddev.h",	"HIDIOCAPPLICATION",	0x4802},
-	{"linux/hiddev.h",	"HIDIOCGDEVINFO",	0x4803},
-	{"linux/hiddev.h",	"HIDIOCGSTRING",	0x4804},
-	{"linux/hiddev.h",	"HIDIOCINITREPORT",	0x4805},
-	{"linux/hiddev.h",	"HIDIOCGREPORT",	0x4807},
-	{"linux/hiddev.h",	"HIDIOCSREPORT",	0x4808},
-	{"linux/hiddev.h",	"HIDIOCGREPORTINFO",	0x4809},
-	{"linux/hiddev.h",	"HIDIOCGFIELDINFO",	0x480a},
-	{"linux/hiddev.h",	"HIDIOCGUSAGE",	0x480b},
-	{"linux/hiddev.h",	"HIDIOCSUSAGE",	0x480c},
-	{"linux/hiddev.h",	"HIDIOCGUCODE",	0x480d},
-	{"linux/isdn.h",	"IIOCNETAIF",	0x4901},
-	{"linux/isdn.h",	"IIOCNETDIF",	0x4902},
-	{"linux/isdn.h",	"IIOCNETSCF",	0x4903},
-	{"linux/isdn.h",	"IIOCNETGCF",	0x4904},
-	{"linux/isdn.h",	"IIOCNETANM",	0x4905},
-	{"linux/isdn.h",	"IIOCNETDNM",	0x4906},
-	{"linux/isdn.h",	"IIOCNETGNM",	0x4907},
-	{"linux/isdn.h",	"IIOCGETSET",	0x4908},
-	{"linux/isdn.h",	"IIOCSETSET",	0x4909},
-	{"linux/isdn.h",	"IIOCSETVER",	0x490a},
-	{"linux/isdn.h",	"IIOCNETHUP",	0x490b},
-	{"linux/isdn.h",	"IIOCSETGST",	0x490c},
-	{"linux/isdn.h",	"IIOCSETBRJ",	0x490d},
-	{"linux/isdn.h",	"IIOCSIGPRF",	0x490e},
-	{"linux/isdn.h",	"IIOCGETPRF",	0x490f},
-	{"linux/isdn.h",	"IIOCSETPRF",	0x4910},
-	{"linux/isdn.h",	"IIOCGETMAP",	0x4911},
-	{"linux/isdn.h",	"IIOCSETMAP",	0x4912},
-	{"linux/isdn.h",	"IIOCNETASL",	0x4913},
-	{"linux/isdn.h",	"IIOCNETDIL",	0x4914},
-	{"linux/isdn.h",	"IIOCGETCPS",	0x4915},
-	{"linux/isdn.h",	"IIOCGETDVR",	0x4916},
-	{"linux/isdn.h",	"IIOCNETLCR",	0x4917},
-	{"linux/isdn.h",	"IIOCNETDWRSET",	0x4918},
-	{"linux/isdn.h",	"IIOCNETALN",	0x4920},
-	{"linux/isdn.h",	"IIOCNETDLN",	0x4921},
-	{"linux/isdn.h",	"IIOCNETGPN",	0x4922},
-	{"linux/isdn.h",	"IIOCDBGVAR",	0x497f},
-	{"linux/isdn.h",	"IIOCDRVCTL",	0x4980},
-	{"linux/soundcard.h",	"SOUND_MIXER_INFO",	0x4d65},
-	{"linux/soundcard.h",	"SOUND_OLD_MIXER_INFO",	0x4d65},
-	{"linux/soundcard.h",	"SOUND_MIXER_ACCESS",	0x4d66},
-	{"linux/soundcard.h",	"SOUND_MIXER_AGC",	0x4d67},
-	{"linux/soundcard.h",	"SOUND_MIXER_3DSE",	0x4d68},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE1",	0x4d6f},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE2",	0x4d70},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE3",	0x4d71},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE4",	0x4d72},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE5",	0x4d73},
-	{"linux/soundcard.h",	"SOUND_MIXER_GETLEVELS",	0x4d74},
-	{"linux/soundcard.h",	"SOUND_MIXER_SETLEVELS",	0x4d75},
-	{"linux/soundcard.h",	"OSS_GETVERSION",	0x4d76},
-	{"linux/soundcard.h",	"SNDCTL_DSP_RESET",	0x5000},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SYNC",	0x5001},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SPEED",	0x5002},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_RATE",	0x5002},
-	{"linux/soundcard.h",	"SNDCTL_DSP_STEREO",	0x5003},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETBLKSIZE",	0x5004},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETFMT",	0x5005},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_BITS",	0x5005},
-	{"linux/soundcard.h",	"SNDCTL_DSP_CHANNELS",	0x5006},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_CHANNELS",	0x5006},
-	{"linux/soundcard.h",	"SOUND_PCM_WRITE_FILTER",	0x5007},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_FILTER",	0x5007},
-	{"linux/soundcard.h",	"SNDCTL_DSP_POST",	0x5008},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SUBDIVIDE",	0x5009},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETFRAGMENT",	0x500a},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETFMTS",	0x500b},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETOSPACE",	0x500c},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETISPACE",	0x500d},
-	{"linux/soundcard.h",	"SNDCTL_DSP_NONBLOCK",	0x500e},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETCAPS",	0x500f},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETTRIGGER",	0x5010},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETTRIGGER",	0x5010},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETIPTR",	0x5011},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETOPTR",	0x5012},
-	{"linux/soundcard.h",	"SNDCTL_DSP_MAPINBUF",	0x5013},
-	{"linux/soundcard.h",	"SNDCTL_DSP_MAPOUTBUF",	0x5014},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETSYNCRO",	0x5015},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETDUPLEX",	0x5016},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETODELAY",	0x5017},
-	{"linux/soundcard.h",	"SNDCTL_DSP_PROFILE",	0x5017},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETCHANNELMASK",	0x5040},
-	{"linux/soundcard.h",	"SNDCTL_DSP_BIND_CHANNEL",	0x5041},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETSPDIF",	0x5042},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETSPDIF",	0x5043},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_RESET",	0x5100},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_SYNC",	0x5101},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_INFO",	0x5102},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_CTRLRATE",	0x5103},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_GETOUTCOUNT",	0x5104},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_GETINCOUNT",	0x5105},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_PERCMODE",	0x5106},
-	{"linux/soundcard.h",	"SNDCTL_FM_LOAD_INSTR",	0x5107},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_TESTMIDI",	0x5108},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_RESETSAMPLES",	0x5109},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_NRSYNTHS",	0x510a},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_NRMIDIS",	0x510b},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_INFO",	0x510c},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_THRESHOLD",	0x510d},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_MEMAVL",	0x510e},
-	{"linux/soundcard.h",	"SNDCTL_FM_4OP_ENABLE",	0x510f},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_PANIC",	0x5111},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_OUTOFBAND",	0x5112},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_GETTIME",	0x5113},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_ID",	0x5114},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_CONTROL",	0x5115},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_REMOVESAMPLE",	0x5116},
-	{"linux/random.h",	"RNDGETENTCNT",	0x5200},
-	{"linux/random.h",	"RNDADDTOENTCNT",	0x5201},
-	{"linux/random.h",	"RNDGETPOOL",	0x5202},
-	{"linux/random.h",	"RNDADDENTROPY",	0x5203},
-	{"linux/random.h",	"RNDZAPENTCNT",	0x5204},
-	{"linux/random.h",	"RNDCLEARPOOL",	0x5206},
-	{"linux/soundcard.h",	"SNDCTL_TMR_TIMEBASE",	0x5401},
-	{"linux/soundcard.h",	"SNDCTL_TMR_START",	0x5402},
-	{"linux/soundcard.h",	"SNDCTL_TMR_STOP",	0x5403},
-	{"linux/soundcard.h",	"SNDCTL_TMR_CONTINUE",	0x5404},
-	{"linux/soundcard.h",	"SNDCTL_TMR_TEMPO",	0x5405},
-	{"linux/soundcard.h",	"SNDCTL_TMR_SOURCE",	0x5406},
-	{"linux/soundcard.h",	"SNDCTL_TMR_METRONOME",	0x5407},
-	{"linux/soundcard.h",	"SNDCTL_TMR_SELECT",	0x5408},
-	{"asm/ioctls.h",	"TIOCEXCL",	0x540c},
-	{"asm/ioctls.h",	"TIOCNXCL",	0x540d},
-	{"asm/ioctls.h",	"TIOCSCTTY",	0x540e},
-	{"asm/ioctls.h",	"TIOCSTI",	0x5412},
-	{"asm/ioctls.h",	"TIOCMGET",	0x5415},
-	{"asm/ioctls.h",	"TIOCMBIS",	0x5416},
-	{"asm/ioctls.h",	"TIOCMBIC",	0x5417},
-	{"asm/ioctls.h",	"TIOCMSET",	0x5418},
-	{"asm/ioctls.h",	"TIOCGSOFTCAR",	0x5419},
-	{"asm/ioctls.h",	"TIOCSSOFTCAR",	0x541a},
-	{"asm/ioctls.h",	"TIOCLINUX",	0x541c},
-	{"asm/ioctls.h",	"TIOCCONS",	0x541d},
-	{"asm/ioctls.h",	"TIOCGSERIAL",	0x541e},
-	{"asm/ioctls.h",	"TIOCSSERIAL",	0x541f},
-	{"asm/ioctls.h",	"TIOCPKT",	0x5420},
-	{"asm/ioctls.h",	"TIOCNOTTY",	0x5422},
-	{"asm/ioctls.h",	"TIOCSETD",	0x5423},
-	{"asm/ioctls.h",	"TIOCGETD",	0x5424},
-	{"asm/ioctls.h",	"TCSBRKP",	0x5425},
-	{"asm/ioctls.h",	"TIOCTTYGSTRUCT",	0x5426},
-	{"asm/ioctls.h",	"TIOCSBRK",	0x5427},
-	{"asm/ioctls.h",	"TIOCCBRK",	0x5428},
-	{"asm/ioctls.h",	"TIOCGSID",	0x5429},
-	{"asm/ioctls.h",	"TIOCGPTN",	0x5430},
-	{"asm/ioctls.h",	"TIOCSPTLCK",	0x5431},
-	{"asm/ioctls.h",	"TIOCSERCONFIG",	0x5453},
-	{"asm/ioctls.h",	"TIOCSERGWILD",	0x5454},
-	{"asm/ioctls.h",	"TIOCSERSWILD",	0x5455},
-	{"asm/ioctls.h",	"TIOCGLCKTRMIOS",	0x5456},
-	{"asm/ioctls.h",	"TIOCSLCKTRMIOS",	0x5457},
-	{"asm/ioctls.h",	"TIOCSERGSTRUCT",	0x5458},
-	{"asm/ioctls.h",	"TIOCSERGETLSR",	0x5459},
-	{"asm/ioctls.h",	"TIOCSERGETMULTI",	0x545a},
-	{"asm/ioctls.h",	"TIOCSERSETMULTI",	0x545b},
-	{"asm/ioctls.h",	"TIOCMIWAIT",	0x545c},
-	{"asm/ioctls.h",	"TIOCGICOUNT",	0x545d},
-	{"asm/ioctls.h",	"TIOCGHAYESESP",	0x545e},
-	{"asm/ioctls.h",	"TIOCSHAYESESP",	0x545f},
-	{"linux/if_tun.h",	"TUNSETNOCSUM",	0x54c8},
-	{"linux/if_tun.h",	"TUNSETDEBUG",	0x54c9},
-	{"linux/if_tun.h",	"TUNSETIFF",	0x54ca},
-	{"linux/if_tun.h",	"TUNSETPERSIST",	0x54cb},
-	{"linux/if_tun.h",	"TUNSETOWNER",	0x54cc},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CONTROL",	0x5500},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_BULK",	0x5502},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_RESETEP",	0x5503},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_SETINTERFACE",	0x5504},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_SETCONFIGURATION",	0x5505},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_GETDRIVER",	0x5508},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_SUBMITURB",	0x550a},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_DISCARDURB",	0x550b},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_REAPURB",	0x550c},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_REAPURBNDELAY",	0x550d},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_DISCSIGNAL",	0x550e},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CLAIMINTERFACE",	0x550f},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_RELEASEINTERFACE",	0x5510},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CONNECTINFO",	0x5511},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_IOCTL",	0x5512},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_HUB_PORTINFO",	0x5513},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_RESET",	0x5514},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CLEAR_HALT",	0x5515},
-	{"linux/watchdog.h",	"WDIOC_GETSUPPORT",	0x5700},
-	{"linux/watchdog.h",	"WDIOC_GETSTATUS",	0x5701},
-	{"linux/watchdog.h",	"WDIOC_GETBOOTSTATUS",	0x5702},
-	{"linux/watchdog.h",	"WDIOC_GETTEMP",	0x5703},
-	{"linux/watchdog.h",	"WDIOC_SETOPTIONS",	0x5704},
-	{"linux/watchdog.h",	"WDIOC_KEEPALIVE",	0x5705},
-	{"linux/watchdog.h",	"WDIOC_SETTIMEOUT",	0x5706},
-	{"linux/watchdog.h",	"WDIOC_GETTIMEOUT",	0x5707},
-	{"linux/ite_gpio.h",	"ITE_GPIO_IN",	0x5a00},
-	{"linux/ite_gpio.h",	"ITE_GPIO_OUT",	0x5a01},
-	{"linux/ite_gpio.h",	"ITE_GPIO_INT_CTRL",	0x5a02},
-	{"linux/ite_gpio.h",	"ITE_GPIO_IN_STATUS",	0x5a03},
-	{"linux/ite_gpio.h",	"ITE_GPIO_OUT_STATUS",	0x5a04},
-	{"linux/ite_gpio.h",	"ITE_GPIO_GEN_CTRL",	0x5a05},
-	{"linux/ite_gpio.h",	"ITE_GPIO_INT_WAIT",	0x5a06},
-	{"linux/sonet.h",	"SONET_GETSTAT",	0x6110},
-	{"linux/sonet.h",	"SONET_GETSTATZ",	0x6111},
-	{"linux/sonet.h",	"SONET_SETDIAG",	0x6112},
-	{"linux/sonet.h",	"SONET_CLRDIAG",	0x6113},
-	{"linux/sonet.h",	"SONET_GETDIAG",	0x6114},
-	{"linux/sonet.h",	"SONET_SETFRAMING",	0x6115},
-	{"linux/sonet.h",	"SONET_GETFRAMING",	0x6116},
-	{"linux/sonet.h",	"SONET_GETFRSENSE",	0x6117},
-	{"linux/atm_idt77105.h",	"IDT77105_GETSTAT",	0x6132},
-	{"linux/atm_idt77105.h",	"IDT77105_GETSTATZ",	0x6133},
-	{"linux/atmdev.h",	"ATM_GETSTAT",	0x6150},
-	{"linux/atmdev.h",	"ATM_GETSTATZ",	0x6151},
-	{"linux/atmdev.h",	"ATM_GETLOOP",	0x6152},
-	{"linux/atmdev.h",	"ATM_SETLOOP",	0x6153},
-	{"linux/atmdev.h",	"ATM_QUERYLOOP",	0x6154},
-	{"linux/atm_eni.h",	"ENI_MEMDUMP",	0x6160},
-	{"linux/atm_nicstar.h",	"NS_GETPSTAT",	0x6161},
-	{"linux/atm_zatm.h",	"ZATM_GETPOOL",	0x6161},
-	{"linux/atm_nicstar.h",	"NS_SETBUFLEV",	0x6162},
-	{"linux/atm_zatm.h",	"ZATM_GETPOOLZ",	0x6162},
-	{"linux/atm_nicstar.h",	"NS_ADJBUFLEV",	0x6163},
-	{"linux/atm_zatm.h",	"ZATM_SETPOOL",	0x6163},
-	{"linux/atm_zatm.h",	"ZATM_GETTHIST",	0x6164},
-	{"linux/atm_eni.h",	"ENI_SETMULT",	0x6167},
-	{"linux/atm_tcp.h",	"SIOCSIFATMTCP",	0x6180},
-	{"linux/atmdev.h",	"ATM_GETLINKRATE",	0x6181},
-	{"linux/atmdev.h",	"ATM_GETNAMES",	0x6183},
-	{"linux/atmdev.h",	"ATM_GETTYPE",	0x6184},
-	{"linux/atmdev.h",	"ATM_GETESI",	0x6185},
-	{"linux/atmdev.h",	"ATM_GETADDR",	0x6186},
-	{"linux/atmdev.h",	"ATM_RSTADDR",	0x6187},
-	{"linux/atmdev.h",	"ATM_ADDADDR",	0x6188},
-	{"linux/atmdev.h",	"ATM_DELADDR",	0x6189},
-	{"linux/atmdev.h",	"ATM_GETCIRANGE",	0x618a},
-	{"linux/atmdev.h",	"ATM_SETCIRANGE",	0x618b},
-	{"linux/atmdev.h",	"ATM_SETESI",	0x618c},
-	{"linux/atmdev.h",	"ATM_SETESIF",	0x618d},
-	{"linux/atm_tcp.h",	"ATMTCP_CREATE",	0x618e},
-	{"linux/atm_tcp.h",	"ATMTCP_REMOVE",	0x618f},
-	{"linux/atmlec.h",	"ATMLEC_CTRL",	0x61d0},
-	{"linux/atmlec.h",	"ATMLEC_DATA",	0x61d1},
-	{"linux/atmlec.h",	"ATMLEC_MCAST",	0x61d2},
-	{"linux/atmmpc.h",	"ATMMPC_CTRL",	0x61d8},
-	{"linux/atmmpc.h",	"ATMMPC_DATA",	0x61d9},
-	{"linux/atmclip.h",	"SIOCMKCLIP",	0x61e0},
-	{"linux/atmarp.h",	"ATMARPD_CTRL",	0x61e1},
-	{"linux/atmarp.h",	"ATMARP_MKIP",	0x61e2},
-	{"linux/atmarp.h",	"ATMARP_SETENTRY",	0x61e3},
-	{"linux/atmarp.h",	"ATMARP_ENCAP",	0x61e5},
-	{"linux/atmsvc.h",	"ATMSIGD_CTRL",	0x61f0},
-	{"linux/atmdev.h",	"ATM_SETSC",	0x61f1},
-	{"linux/atmdev.h",	"ATM_SETBACKEND",	0x61f2},
-	{"linux/coda.h",	"CIOC_KERNEL_VERSION",	0x630a},
-	{"linux/comstats.h",	"COM_GETPORTSTATS",	0x631e},
-	{"linux/comstats.h",	"COM_CLRPORTSTATS",	0x631f},
-	{"linux/comstats.h",	"COM_GETBRDSTATS",	0x6320},
-	{"linux/comstats.h",	"COM_READPORT",	0x6328},
-	{"linux/comstats.h",	"COM_READBOARD",	0x6329},
-	{"linux/comstats.h",	"COM_READPANEL",	0x632a},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_GET_PROTO_REV",	0x6400},
-	{"linux/video_decoder.h",	"DECODER_GET_CAPABILITIES",	0x6401},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_SET_EVENT_MASK",	0x6402},
-	{"linux/video_decoder.h",	"DECODER_GET_STATUS",	0x6402},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_RELEASE_EVENT_QUEUE",	0x6403},
-	{"linux/video_decoder.h",	"DECODER_SET_NORM",	0x6403},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_SET_DEBUG_MASK",	0x6404},
-	{"linux/video_decoder.h",	"DECODER_SET_INPUT",	0x6404},
-	{"linux/video_decoder.h",	"DECODER_SET_OUTPUT",	0x6405},
-	{"linux/video_decoder.h",	"DECODER_ENABLE_OUTPUT",	0x6406},
-	{"linux/video_decoder.h",	"DECODER_SET_PICTURE",	0x6407},
-	{"linux/video_decoder.h",	"DECODER_DUMP",	0x64c0},
-	{"linux/video_encoder.h",	"ENCODER_GET_CAPABILITIES",	0x6501},
-	{"linux/video_encoder.h",	"ENCODER_SET_NORM",	0x6502},
-	{"linux/video_encoder.h",	"ENCODER_SET_INPUT",	0x6503},
-	{"linux/video_encoder.h",	"ENCODER_SET_OUTPUT",	0x6504},
-	{"linux/video_encoder.h",	"ENCODER_ENABLE_OUTPUT",	0x6505},
-	{"linux/ext2_fs.h",	"EXT2_IOC_GETFLAGS",	0x6601},
-	{"linux/ext3_fs.h",	"EXT3_IOC_GETFLAGS",	0x6601},
-	{"asm/ioctls.h",	"FIOCLEX",	0x6601},
-	{"linux/ext2_fs.h",	"EXT2_IOC_SETFLAGS",	0x6602},
-	{"linux/ext3_fs.h",	"EXT3_IOC_SETFLAGS",	0x6602},
-	{"asm/ioctls.h",	"FIONCLEX",	0x6602},
-	{"linux/ext3_fs.h",	"EXT3_IOC_GETVERSION",	0x6603},
-	{"linux/ext3_fs.h",	"EXT3_IOC_SETVERSION",	0x6604},
-	{"linux/ext3_fs.h",	"EXT3_IOC_WAIT_FOR_READONLY",	0x6663},
-	{"asm/sockios.h",	"FIOGETOWN",	0x667b},
-	{"asm/sockios.h",	"FIOSETOWN",	0x667c},
-	{"asm/ioctls.h",	"FIOASYNC",	0x667d},
-	{"asm/ioctls.h",	"FIONBIO",	0x667e},
-	{"asm/ioctls.h",	"FIONREAD",	0x667f},
-	{"linux/i2o-dev.h",	"I2OGETIOPS",	0x6900},
-	{"linux/i2o-dev.h",	"I2OHRTGET",	0x6901},
-	{"linux/i2o-dev.h",	"I2OLCTGET",	0x6902},
-	{"linux/i2o-dev.h",	"I2OPARMSET",	0x6903},
-	{"linux/i2o-dev.h",	"I2OPARMGET",	0x6904},
-	{"linux/i2o-dev.h",	"I2OSWDL",	0x6905},
-	{"linux/i2o-dev.h",	"I2OSWUL",	0x6906},
-	{"linux/i2o-dev.h",	"I2OSWDEL",	0x6907},
-	{"linux/i2o-dev.h",	"I2OVALIDATE",	0x6908},
-	{"linux/i2o-dev.h",	"I2OHTML",	0x6909},
-	{"linux/i2o-dev.h",	"I2OEVTREG",	0x690a},
-	{"linux/i2o-dev.h",	"I2OEVTGET",	0x690b},
-	{"linux/i8k.h",	"I8K_BIOS_VERSION",	0x6980},
-	{"linux/i8k.h",	"I8K_MACHINE_ID",	0x6981},
-	{"linux/i8k.h",	"I8K_POWER_STATUS",	0x6982},
-	{"linux/i8k.h",	"I8K_FN_STATUS",	0x6983},
-	{"linux/i8k.h",	"I8K_GET_TEMP",	0x6984},
-	{"linux/i8k.h",	"I8K_GET_SPEED",	0x6985},
-	{"linux/i8k.h",	"I8K_GET_FAN",	0x6986},
-	{"linux/i8k.h",	"I8K_SET_FAN",	0x6987},
-	{"linux/joystick.h",	"JSIOCGVERSION",	0x6a01},
-	{"linux/joystick.h",	"JSIOCGAXES",	0x6a11},
-	{"linux/joystick.h",	"JSIOCGBUTTONS",	0x6a12},
-	{"linux/joystick.h",	"JSIOCSCORR",	0x6a21},
-	{"linux/joystick.h",	"JSIOCGCORR",	0x6a22},
-	{"linux/joystick.h",	"JSIOCSAXMAP",	0x6a31},
-	{"linux/joystick.h",	"JSIOCGAXMAP",	0x6a32},
-	{"linux/joystick.h",	"JSIOCSBTNMAP",	0x6a33},
-	{"linux/joystick.h",	"JSIOCGBTNMAP",	0x6a34},
-	{"linux/udf_fs_i.h",	"UDF_GETEASIZE",	0x6c40},
-	{"linux/udf_fs_i.h",	"UDF_GETEABLOCK",	0x6c41},
-	{"linux/udf_fs_i.h",	"UDF_GETVOLIDENT",	0x6c42},
-	{"linux/udf_fs_i.h",	"UDF_RELOCATE_BLOCKS",	0x6c43},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_PRETIME",	0x6d00},
-	{"linux/synclink.h",	"MGSL_IOCSPARAMS",	0x6d00},
-	{"linux/mtio.h",	"MTIOCTOP",	0x6d01},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_MPUMODE",	0x6d01},
-	{"linux/synclink.h",	"MGSL_IOCGPARAMS",	0x6d01},
-	{"linux/mtio.h",	"MTIOCGET",	0x6d02},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_MPUCMD",	0x6d02},
-	{"linux/synclink.h",	"MGSL_IOCSTXIDLE",	0x6d02},
-	{"linux/mtio.h",	"MTIOCPOS",	0x6d03},
-	{"linux/synclink.h",	"MGSL_IOCGTXIDLE",	0x6d03},
-	{"linux/mtio.h",	"MTIOCGETCONFIG",	0x6d04},
-	{"linux/synclink.h",	"MGSL_IOCTXENABLE",	0x6d04},
-	{"linux/mtio.h",	"MTIOCSETCONFIG",	0x6d05},
-	{"linux/synclink.h",	"MGSL_IOCRXENABLE",	0x6d05},
-	{"linux/mtio.h",	"MTIOCRDFTSEG",	0x6d06},
-	{"linux/synclink.h",	"MGSL_IOCTXABORT",	0x6d06},
-	{"linux/mtio.h",	"MTIOCWRFTSEG",	0x6d07},
-	{"linux/synclink.h",	"MGSL_IOCGSTATS",	0x6d07},
-	{"linux/mtio.h",	"MTIOCVOLINFO",	0x6d08},
-	{"linux/synclink.h",	"MGSL_IOCWAITEVENT",	0x6d08},
-	{"linux/mtio.h",	"MTIOCGETSIZE",	0x6d09},
-	{"linux/synclink.h",	"MGSL_IOCLOOPTXDONE",	0x6d09},
-	{"linux/mtio.h",	"MTIOCFTFORMAT",	0x6d0a},
-	{"linux/mtio.h",	"MTIOCFTCMD",	0x6d0b},
-	{"linux/synclink.h",	"MGSL_IOCCLRMODCOUNT",	0x6d0f},
-	{"linux/zftape.h",	"MTIOC_ZFTAPE_GETBLKSZ",	0x6d68},
-	{"linux/ncp_fs.h",	"NCP_IOC_NCPREQUEST",	0x6e01},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETMOUNTUID",	0x6e02},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETMOUNTUID2",	0x6e02},
-	{"linux/ncp_fs.h",	"NCP_IOC_CONN_LOGGED_IN",	0x6e03},
-	{"linux/ncp_fs.h",	"NCP_IOC_GET_FS_INFO",	0x6e04},
-	{"linux/ncp_fs.h",	"NCP_IOC_GET_FS_INFO_V2",	0x6e04},
-	{"linux/ncp_fs.h",	"NCP_IOC_SIGN_INIT",	0x6e05},
-	{"linux/ncp_fs.h",	"NCP_IOC_SIGN_WANTED",	0x6e06},
-	{"linux/ncp_fs.h",	"NCP_IOC_SET_SIGN_WANTED",	0x6e06},
-	{"linux/ncp_fs.h",	"NCP_IOC_LOCKUNLOCK",	0x6e07},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETROOT",	0x6e08},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETROOT",	0x6e08},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETOBJECTNAME",	0x6e09},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETOBJECTNAME",	0x6e09},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETPRIVATEDATA",	0x6e0a},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETPRIVATEDATA",	0x6e0a},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETCHARSETS",	0x6e0b},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETCHARSETS",	0x6e0b},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETDENTRYTTL",	0x6e0c},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETDENTRYTTL",	0x6e0c},
-	{"linux/matroxfb.h",	"MATROXFB_SET_OUTPUT_CONNECTION",	0x6ef8},
-	{"linux/matroxfb.h",	"MATROXFB_GET_OUTPUT_CONNECTION",	0x6ef8},
-	{"linux/matroxfb.h",	"MATROXFB_GET_AVAILABLE_OUTPUTS",	0x6ef9},
-	{"linux/matroxfb.h",	"MATROXFB_SET_OUTPUT_MODE",	0x6efa},
-	{"linux/matroxfb.h",	"MATROXFB_GET_OUTPUT_MODE",	0x6efa},
-	{"linux/matroxfb.h",	"MATROXFB_GET_ALL_OUTPUTS",	0x6efb},
-	{"linux/rtc.h",	"RTC_AIE_ON",	0x7001},
-	{"linux/rtc.h",	"RTC_AIE_OFF",	0x7002},
-	{"linux/intermezzo_fs.h",	"PRESTO_GETMOUNT",	0x7003},
-	{"linux/rtc.h",	"RTC_UIE_ON",	0x7003},
-	{"linux/intermezzo_fs.h",	"PRESTO_SETPID",	0x7004},
-	{"linux/rtc.h",	"RTC_UIE_OFF",	0x7004},
-	{"linux/rtc.h",	"RTC_PIE_ON",	0x7005},
-	{"linux/intermezzo_fs.h",	"PRESTO_CLOSE_JOURNALF",	0x7006},
-	{"linux/rtc.h",	"RTC_PIE_OFF",	0x7006},
-	{"linux/intermezzo_fs.h",	"PRESTO_SET_FSETROOT",	0x7007},
-	{"linux/rtc.h",	"RTC_ALM_SET",	0x7007},
-	{"linux/intermezzo_fs.h",	"PRESTO_CLEAR_FSETROOT",	0x7008},
-	{"linux/rtc.h",	"RTC_ALM_READ",	0x7008},
-	{"linux/intermezzo_fs.h",	"PRESTO_SETOPT",	0x7009},
-	{"linux/rtc.h",	"RTC_RD_TIME",	0x7009},
-	{"linux/intermezzo_fs.h",	"PRESTO_GETOPT",	0x700a},
-	{"linux/rtc.h",	"RTC_SET_TIME",	0x700a},
-	{"linux/intermezzo_fs.h",	"PRESTO_GET_KMLSIZE",	0x700b},
-	{"linux/rtc.h",	"RTC_IRQP_READ",	0x700b},
-	{"linux/intermezzo_fs.h",	"PRESTO_GET_RECNO",	0x700c},
-	{"linux/rtc.h",	"RTC_IRQP_SET",	0x700c},
-	{"linux/rtc.h",	"RTC_EPOCH_READ",	0x700d},
-	{"linux/rtc.h",	"RTC_EPOCH_SET",	0x700e},
-	{"linux/rtc.h",	"RTC_WIE_ON",	0x700f},
-	{"linux/rtc.h",	"RTC_WKALM_SET",	0x700f},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_SETATTR",	0x7010},
-	{"linux/rtc.h",	"RTC_WIE_OFF",	0x7010},
-	{"linux/rtc.h",	"RTC_WKALM_RD",	0x7010},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_CREATE",	0x7011},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_LINK",	0x7012},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_UNLINK",	0x7013},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_SYMLINK",	0x7014},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_MKDIR",	0x7015},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_RMDIR",	0x7016},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_MKNOD",	0x7017},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_RENAME",	0x7018},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_CLOSE",	0x701a},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_IOPEN",	0x701b},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_SETEXTATTR",	0x701c},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_DELEXTATTR",	0x701d},
-	{"linux/intermezzo_fs.h",	"PRESTO_MARK",	0x7020},
-	{"linux/intermezzo_fs.h",	"PRESTO_RELEASE_PERMIT",	0x7021},
-	{"linux/intermezzo_fs.h",	"PRESTO_CLEAR_ALL_FSETROOTS",	0x7022},
-	{"linux/intermezzo_fs.h",	"PRESTO_BACKFETCH_LML",	0x7023},
-	{"linux/intermezzo_fs.h",	"PRESTO_REINT",	0x7024},
-	{"linux/intermezzo_fs.h",	"PRESTO_CANCEL_LML",	0x7025},
-	{"linux/intermezzo_fs.h",	"PRESTO_RESET_FSET",	0x7026},
-	{"linux/intermezzo_fs.h",	"PRESTO_COMPLETE_CLOSES",	0x7027},
-	{"linux/intermezzo_fs.h",	"PRESTO_REINT_BEGIN",	0x7030},
-	{"linux/intermezzo_fs.h",	"PRESTO_DO_REINT",	0x7031},
-	{"linux/intermezzo_fs.h",	"PRESTO_REINT_END",	0x7032},
-	{"linux/nvram.h",	"NVRAM_INIT",	0x7040},
-	{"linux/nvram.h",	"NVRAM_SETCKS",	0x7041},
-	{"linux/ppdev.h",	"PPSETMODE",	0x7080},
-	{"linux/ppdev.h",	"PPRSTATUS",	0x7081},
-	{"linux/ppdev.h",	"PPRCONTROL",	0x7083},
-	{"linux/ppdev.h",	"PPWCONTROL",	0x7084},
-	{"linux/ppdev.h",	"PPRDATA",	0x7085},
-	{"linux/ppdev.h",	"PPWDATA",	0x7086},
-	{"linux/ppdev.h",	"PPCLAIM",	0x708b},
-	{"linux/ppdev.h",	"PPRELEASE",	0x708c},
-	{"linux/ppdev.h",	"PPYIELD",	0x708d},
-	{"linux/ppdev.h",	"PPFCONTROL",	0x708e},
-	{"linux/ppdev.h",	"PPEXCL",	0x708f},
-	{"linux/ppdev.h",	"PPDATADIR",	0x7090},
-	{"linux/ppdev.h",	"PPNEGOT",	0x7091},
-	{"linux/ppdev.h",	"PPWCTLONIRQ",	0x7092},
-	{"linux/ppdev.h",	"PPCLRIRQ",	0x7093},
-	{"linux/ppdev.h",	"PPSETPHASE",	0x7094},
-	{"linux/ppdev.h",	"PPGETTIME",	0x7095},
-	{"linux/ppdev.h",	"PPSETTIME",	0x7096},
-	{"linux/ppdev.h",	"PPGETMODES",	0x7097},
-	{"linux/ppdev.h",	"PPGETMODE",	0x7098},
-	{"linux/ppdev.h",	"PPGETPHASE",	0x7099},
-	{"linux/ppdev.h",	"PPGETFLAGS",	0x709a},
-	{"linux/ppdev.h",	"PPSETFLAGS",	0x709b},
-	{"linux/serio.h",	"SPIOCSTYPE",	0x7101},
-	{"linux/telephony.h",	"PHONE_CAPABILITIES",	0x7180},
-	{"linux/telephony.h",	"PHONE_CAPABILITIES_LIST",	0x7181},
-	{"linux/telephony.h",	"PHONE_CAPABILITIES_CHECK",	0x7182},
-	{"linux/telephony.h",	"PHONE_RING",	0x7183},
-	{"linux/telephony.h",	"PHONE_HOOKSTATE",	0x7184},
-	{"linux/telephony.h",	"PHONE_MAXRINGS",	0x7185},
-	{"linux/telephony.h",	"PHONE_RING_CADENCE",	0x7186},
-	{"linux/telephony.h",	"OLD_PHONE_RING_START",	0x7187},
-	{"linux/telephony.h",	"PHONE_RING_START",	0x7187},
-	{"linux/telephony.h",	"PHONE_RING_STOP",	0x7188},
-	{"linux/telephony.h",	"PHONE_REC_CODEC",	0x7189},
-	{"linux/telephony.h",	"PHONE_REC_START",	0x718a},
-	{"linux/telephony.h",	"PHONE_REC_STOP",	0x718b},
-	{"linux/telephony.h",	"PHONE_REC_DEPTH",	0x718c},
-	{"linux/telephony.h",	"PHONE_FRAME",	0x718d},
-	{"linux/telephony.h",	"PHONE_REC_VOLUME",	0x718e},
-	{"linux/telephony.h",	"PHONE_REC_LEVEL",	0x718f},
-	{"linux/telephony.h",	"PHONE_PLAY_CODEC",	0x7190},
-	{"linux/telephony.h",	"PHONE_PLAY_START",	0x7191},
-	{"linux/telephony.h",	"PHONE_PLAY_STOP",	0x7192},
-	{"linux/telephony.h",	"PHONE_PLAY_DEPTH",	0x7193},
-	{"linux/telephony.h",	"PHONE_PLAY_VOLUME",	0x7194},
-	{"linux/telephony.h",	"PHONE_PLAY_LEVEL",	0x7195},
-	{"linux/telephony.h",	"PHONE_DTMF_READY",	0x7196},
-	{"linux/telephony.h",	"PHONE_GET_DTMF",	0x7197},
-	{"linux/telephony.h",	"PHONE_GET_DTMF_ASCII",	0x7198},
-	{"linux/telephony.h",	"PHONE_DTMF_OOB",	0x7199},
-	{"linux/telephony.h",	"PHONE_EXCEPTION",	0x719a},
-	{"linux/telephony.h",	"PHONE_PLAY_TONE",	0x719b},
-	{"linux/telephony.h",	"PHONE_SET_TONE_ON_TIME",	0x719c},
-	{"linux/telephony.h",	"PHONE_SET_TONE_OFF_TIME",	0x719d},
-	{"linux/telephony.h",	"PHONE_GET_TONE_ON_TIME",	0x719e},
-	{"linux/telephony.h",	"PHONE_GET_TONE_OFF_TIME",	0x719f},
-	{"linux/telephony.h",	"PHONE_GET_TONE_STATE",	0x71a0},
-	{"linux/telephony.h",	"PHONE_BUSY",	0x71a1},
-	{"linux/telephony.h",	"PHONE_RINGBACK",	0x71a2},
-	{"linux/telephony.h",	"PHONE_DIALTONE",	0x71a3},
-	{"linux/telephony.h",	"PHONE_CPT_STOP",	0x71a4},
-	{"linux/telephony.h",	"PHONE_PSTN_SET_STATE",	0x71a4},
-	{"linux/telephony.h",	"PHONE_PSTN_GET_STATE",	0x71a5},
-	{"linux/telephony.h",	"PHONE_WINK_DURATION",	0x71a6},
-	{"linux/telephony.h",	"PHONE_QUERY_CODEC",	0x71a7},
-	{"linux/telephony.h",	"PHONE_PSTN_LINETEST",	0x71a8},
-	{"linux/telephony.h",	"PHONE_VAD",	0x71a9},
-	{"linux/telephony.h",	"PHONE_WINK",	0x71aa},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_RESET",	0x71c0},
-	{"linux/ixjuser.h",	"IXJCTL_CARDTYPE",	0x71c1},
-	{"linux/ixjuser.h",	"IXJCTL_SERIAL",	0x71c2},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_TYPE",	0x71c3},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_VERSION",	0x71c4},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_IDLE",	0x71c5},
-	{"linux/ixjuser.h",	"IXJCTL_TESTRAM",	0x71c6},
-	{"linux/ixjuser.h",	"IXJCTL_SET_FILTER",	0x71c7},
-	{"linux/ixjuser.h",	"IXJCTL_GET_FILTER_HIST",	0x71c8},
-	{"linux/ixjuser.h",	"IXJCTL_INIT_TONE",	0x71c9},
-	{"linux/ixjuser.h",	"IXJCTL_TONE_CADENCE",	0x71ca},
-	{"linux/ixjuser.h",	"IXJCTL_AEC_START",	0x71cb},
-	{"linux/ixjuser.h",	"IXJCTL_AEC_STOP",	0x71cc},
-	{"linux/ixjuser.h",	"IXJCTL_AEC_GET_LEVEL",	0x71cd},
-	{"linux/ixjuser.h",	"IXJCTL_SET_LED",	0x71ce},
-	{"linux/ixjuser.h",	"IXJCTL_MIXER",	0x71cf},
-	{"linux/ixjuser.h",	"IXJCTL_DAA_COEFF_SET",	0x71d0},
-	{"linux/ixjuser.h",	"IXJCTL_PORT",	0x71d1},
-	{"linux/ixjuser.h",	"IXJCTL_DAA_AGAIN",	0x71d2},
-	{"linux/ixjuser.h",	"IXJCTL_PSTN_LINETEST",	0x71d3},
-	{"linux/ixjuser.h",	"IXJCTL_CID",	0x71d4},
-	{"linux/ixjuser.h",	"IXJCTL_POTS_PSTN",	0x71d5},
-	{"linux/ixjuser.h",	"IXJCTL_FILTER_CADENCE",	0x71d6},
-	{"linux/ixjuser.h",	"IXJCTL_PLAY_CID",	0x71d7},
-	{"linux/ixjuser.h",	"IXJCTL_VMWI",	0x71d8},
-	{"linux/ixjuser.h",	"IXJCTL_CIDCW",	0x71d9},
-	{"linux/ixjuser.h",	"IXJCTL_VERSION",	0x71da},
-	{"linux/telephony.h",	"PHONE_REC_VOLUME_LINEAR",	0x71db},
-	{"linux/telephony.h",	"PHONE_PLAY_VOLUME_LINEAR",	0x71dc},
-	{"linux/ixjuser.h",	"IXJCTL_SET_FILTER_RAW",	0x71dd},
-	{"linux/ixjuser.h",	"IXJCTL_HZ",	0x71e0},
-	{"linux/ixjuser.h",	"IXJCTL_RATE",	0x71e1},
-	{"linux/ixjuser.h",	"IXJCTL_FRAMES_READ",	0x71e2},
-	{"linux/ixjuser.h",	"IXJCTL_FRAMES_WRITTEN",	0x71e3},
-	{"linux/ixjuser.h",	"IXJCTL_READ_WAIT",	0x71e4},
-	{"linux/ixjuser.h",	"IXJCTL_WRITE_WAIT",	0x71e5},
-	{"linux/ixjuser.h",	"IXJCTL_DRYBUFFER_READ",	0x71e6},
-	{"linux/ixjuser.h",	"IXJCTL_DRYBUFFER_CLEAR",	0x71e7},
-	{"linux/ixjuser.h",	"IXJCTL_DTMF_PRESCALE",	0x71e8},
-	{"linux/ixjuser.h",	"IXJCTL_SIGCTL",	0x71e9},
-	{"linux/ixjuser.h",	"IXJCTL_SC_RXG",	0x71ea},
-	{"linux/ixjuser.h",	"IXJCTL_SC_TXG",	0x71eb},
-	{"linux/ixjuser.h",	"IXJCTL_INTERCOM_START",	0x71fd},
-	{"linux/ixjuser.h",	"IXJCTL_INTERCOM_STOP",	0x71fe},
-	{"linux/msdos_fs.h",	"VFAT_IOCTL_READDIR_BOTH",	0x7201},
-	{"linux/msdos_fs.h",	"VFAT_IOCTL_READDIR_SHORT",	0x7202},
-	{"asm/sockios.h",	"SIOCATMARK",	0x7307},
-	{"asm/sockios.h",	"SIOCSPGRP",	0x7308},
-	{"asm/sockios.h",	"SIOCGPGRP",	0x7309},
-	{"linux/cdk.h",	"STL_BINTR",	0x7314},
-	{"linux/cdk.h",	"STL_BSTART",	0x7315},
-	{"linux/cdk.h",	"STL_BSTOP",	0x7316},
-	{"linux/cdk.h",	"STL_BRESET",	0x7317},
-	{"linux/cdk.h",	"STL_GETPFLAG",	0x7350},
-	{"linux/cdk.h",	"STL_SETPFLAG",	0x7351},
-	{"asm/ioctls.h",	"TIOCGETP",	0x7408},
-	{"asm/ioctls.h",	"TIOCSETP",	0x7409},
-	{"asm/ioctls.h",	"TIOCSETN",	0x740a},
-	{"asm/ioctls.h",	"TIOCSETC",	0x7411},
-	{"asm/ioctls.h",	"TIOCGETC",	0x7412},
-	{"asm/ioctls.h",	"TCGETS",	0x7413},
-	{"asm/ioctls.h",	"TCSETS",	0x7414},
-	{"asm/ioctls.h",	"TCSETSW",	0x7415},
-	{"asm/ioctls.h",	"TCSETSF",	0x7416},
-	{"asm/ioctls.h",	"TCGETA",	0x7417},
-	{"asm/ioctls.h",	"TCSETA",	0x7418},
-	{"asm/ioctls.h",	"TCSETAW",	0x7419},
-	{"asm/ioctls.h",	"TCSETAF",	0x741c},
-	{"asm/ioctls.h",	"TCSBRK",	0x741d},
-	{"asm/ioctls.h",	"TCXONC",	0x741e},
-	{"asm/ioctls.h",	"TCFLSH",	0x741f},
-	{"linux/if_ppp.h",	"PPPIOCGCHAN",	0x7437},
-	{"linux/if_ppp.h",	"PPPIOCATTCHAN",	0x7438},
-	{"linux/if_ppp.h",	"PPPIOCDISCONN",	0x7439},
-	{"linux/if_ppp.h",	"PPPIOCCONNECT",	0x743a},
-	{"linux/if_ppp.h",	"PPPIOCSMRRU",	0x743b},
-	{"linux/if_ppp.h",	"PPPIOCDETACH",	0x743c},
-	{"linux/if_ppp.h",	"PPPIOCATTACH",	0x743d},
-	{"linux/if_ppp.h",	"PPPIOCNEWUNIT",	0x743e},
-	{"linux/if_ppp.h",	"PPPIOCGIDLE",	0x743f},
-	{"linux/if_ppp.h",	"PPPIOCSDEBUG",	0x7440},
-	{"linux/if_ppp.h",	"PPPIOCGDEBUG",	0x7441},
-	{"linux/if_ppp.h",	"PPPIOCSACTIVE",	0x7446},
-	{"linux/if_ppp.h",	"PPPIOCSPASS",	0x7447},
-	{"linux/if_ppp.h",	"PPPIOCSNPMODE",	0x744b},
-	{"linux/if_ppp.h",	"PPPIOCGNPMODE",	0x744c},
-	{"linux/if_ppp.h",	"PPPIOCSCOMPRESS",	0x744d},
-	{"linux/if_ppp.h",	"PPPIOCXFERUNIT",	0x744e},
-	{"linux/if_ppp.h",	"PPPIOCSXASYNCMAP",	0x744f},
-	{"linux/if_ppp.h",	"PPPIOCGXASYNCMAP",	0x7450},
-	{"linux/if_ppp.h",	"PPPIOCSMAXCID",	0x7451},
-	{"linux/if_ppp.h",	"PPPIOCSMRU",	0x7452},
-	{"linux/if_ppp.h",	"PPPIOCGMRU",	0x7453},
-	{"linux/if_ppp.h",	"PPPIOCSRASYNCMAP",	0x7454},
-	{"linux/if_ppp.h",	"PPPIOCGRASYNCMAP",	0x7455},
-	{"linux/if_ppp.h",	"PPPIOCGUNIT",	0x7456},
-	{"linux/if_ppp.h",	"PPPIOCSASYNCMAP",	0x7457},
-	{"linux/if_ppp.h",	"PPPIOCGASYNCMAP",	0x7458},
-	{"linux/if_ppp.h",	"PPPIOCSFLAGS",	0x7459},
-	{"linux/if_ppp.h",	"PPPIOCGFLAGS",	0x745a},
-	{"linux/jffs.h",	"JFFS_PRINT_HASH",	0x745a},
-	{"linux/jffs.h",	"JFFS_PRINT_TREE",	0x745b},
-	{"linux/jffs.h",	"JFFS_GET_STATUS",	0x745c},
-	{"asm/ioctls.h",	"TIOCSWINSZ",	0x7467},
-	{"asm/ioctls.h",	"TIOCGWINSZ",	0x7468},
-	{"asm/ioctls.h",	"TIOCSTART",	0x746e},
-	{"asm/ioctls.h",	"TIOCSTOP",	0x746f},
-	{"asm/ioctls.h",	"TIOCOUTQ",	0x7473},
-	{"asm/ioctls.h",	"TIOCGLTC",	0x7474},
-	{"asm/ioctls.h",	"TIOCSLTC",	0x7475},
-	{"asm/ioctls.h",	"TIOCSPGRP",	0x7476},
-	{"asm/ioctls.h",	"TIOCGPGRP",	0x7477},
-	{"linux/isdn_ppp.h",	"PPPIOCGCALLINFO",	0x7480},
-	{"linux/isdn_ppp.h",	"PPPIOCBUNDLE",	0x7481},
-	{"linux/isdn_ppp.h",	"PPPIOCGMPFLAGS",	0x7482},
-	{"linux/isdn_ppp.h",	"PPPIOCSMPFLAGS",	0x7483},
-	{"linux/isdn_ppp.h",	"PPPIOCSMPMTU",	0x7484},
-	{"linux/isdn_ppp.h",	"PPPIOCSMPMRU",	0x7485},
-	{"linux/isdn_ppp.h",	"PPPIOCGCOMPRESSORS",	0x7486},
-	{"linux/isdn_ppp.h",	"PPPIOCSCOMPRESSOR",	0x7487},
-	{"linux/isdn_ppp.h",	"PPPIOCGIFNAME",	0x7488},
-	{"linux/toshiba.h",	"TOSH_SMM",	0x7490},
-	{"linux/smb_fs.h",	"SMB_IOC_GETMOUNTUID",	0x7501},
-	{"linux/smb_fs.h",	"SMB_IOC_NEWCONN",	0x7502},
-	{"linux/smb_fs.h",	"SMB_IOC_GETMOUNTUID32",	0x7503},
-	{"linux/sonypi.h",	"SONYPI_IOCGBRT",	0x7600},
-	{"linux/sonypi.h",	"SONYPI_IOCSBRT",	0x7600},
-	{"linux/ext2_fs.h",	"EXT2_IOC_GETVERSION",	0x7601},
-	{"linux/ext3_fs.h",	"EXT3_IOC_GETVERSION_OLD",	0x7601},
-	{"linux/videodev.h",	"VIDIOCGCAP",	0x7601},
-	{"linux/ext2_fs.h",	"EXT2_IOC_SETVERSION",	0x7602},
-	{"linux/ext3_fs.h",	"EXT3_IOC_SETVERSION_OLD",	0x7602},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT1CAP",	0x7602},
-	{"linux/videodev.h",	"VIDIOCGCHAN",	0x7602},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT1REM",	0x7603},
-	{"linux/videodev.h",	"VIDIOCSCHAN",	0x7603},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT2CAP",	0x7604},
-	{"linux/videodev.h",	"VIDIOCGTUNER",	0x7604},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT2REM",	0x7605},
-	{"linux/videodev.h",	"VIDIOCSTUNER",	0x7605},
-	{"linux/videodev.h",	"VIDIOCGPICT",	0x7606},
-	{"linux/sonypi.h",	"SONYPI_IOCGBATFLAGS",	0x7607},
-	{"linux/videodev.h",	"VIDIOCSPICT",	0x7607},
-	{"linux/sonypi.h",	"SONYPI_IOCGBLUE",	0x7608},
-	{"linux/videodev.h",	"VIDIOCCAPTURE",	0x7608},
-	{"linux/sonypi.h",	"SONYPI_IOCSBLUE",	0x7609},
-	{"linux/videodev.h",	"VIDIOCGWIN",	0x7609},
-	{"linux/videodev.h",	"VIDIOCSWIN",	0x760a},
-	{"linux/videodev.h",	"VIDIOCGFBUF",	0x760b},
-	{"linux/videodev.h",	"VIDIOCSFBUF",	0x760c},
-	{"linux/videodev.h",	"VIDIOCKEY",	0x760d},
-	{"linux/videodev.h",	"VIDIOCGFREQ",	0x760e},
-	{"linux/videodev.h",	"VIDIOCSFREQ",	0x760f},
-	{"linux/videodev.h",	"VIDIOCGAUDIO",	0x7610},
-	{"linux/videodev.h",	"VIDIOCSAUDIO",	0x7611},
-	{"linux/videodev.h",	"VIDIOCSYNC",	0x7612},
-	{"linux/videodev.h",	"VIDIOCMCAPTURE",	0x7613},
-	{"linux/videodev.h",	"VIDIOCGMBUF",	0x7614},
-	{"linux/videodev.h",	"VIDIOCGUNIT",	0x7615},
-	{"linux/videodev.h",	"VIDIOCGCAPTURE",	0x7616},
-	{"linux/videodev.h",	"VIDIOCSCAPTURE",	0x7617},
-	{"linux/videodev.h",	"VIDIOCSPLAYMODE",	0x7618},
-	{"linux/videodev.h",	"VIDIOCSWRITEMODE",	0x7619},
-	{"linux/videodev.h",	"VIDIOCGPLAYINFO",	0x761a},
-	{"linux/videodev.h",	"VIDIOCSMICROCODE",	0x761b},
-	{"linux/videodev.h",	"VIDIOCGVBIFMT",	0x761c},
-	{"linux/videodev.h",	"VIDIOCSVBIFMT",	0x761d},
-	{"linux/meye.h",	"MEYEIOC_G_PARAMS",	0x76c0},
-	{"linux/meye.h",	"MEYEIOC_S_PARAMS",	0x76c1},
-	{"linux/meye.h",	"MEYEIOC_QBUF_CAPT",	0x76c2},
-	{"linux/meye.h",	"MEYEIOC_SYNC",	0x76c3},
-	{"linux/meye.h",	"MEYEIOC_STILLCAPT",	0x76c4},
-	{"linux/meye.h",	"MEYEIOC_STILLJCAPT",	0x76c5},
-	{"linux/dn.h",	"SIOCSNETADDR",	0x89e0},
-	{"linux/dn.h",	"OSIOCSNETADDR",	0x89e0},
-	{"linux/dn.h",	"SIOCGNETADDR",	0x89e1},
-	{"linux/dn.h",	"OSIOCGNETADDR",	0x89e1},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_READY",	0x9360},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_FAIL",	0x9361},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_CATATONIC",	0x9362},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_PROTOVER",	0x9363},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_SETTIMEOUT",	0x9364},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_EXPIRE",	0x9365},
-	{"linux/auto_fs4.h",	"AUTOFS_IOC_EXPIRE_MULTI",	0x9366},
-	{"linux/nbd.h",	"NBD_SET_SOCK",	0xab00},
-	{"linux/nbd.h",	"NBD_SET_BLKSIZE",	0xab01},
-	{"linux/nbd.h",	"NBD_SET_SIZE",	0xab02},
-	{"linux/nbd.h",	"NBD_DO_IT",	0xab03},
-	{"linux/nbd.h",	"NBD_CLEAR_SOCK",	0xab04},
-	{"linux/nbd.h",	"NBD_CLEAR_QUE",	0xab05},
-	{"linux/nbd.h",	"NBD_PRINT_DEBUG",	0xab06},
-	{"linux/nbd.h",	"NBD_SET_SIZE_BLOCKS",	0xab07},
-	{"linux/nbd.h",	"NBD_DISCONNECT",	0xab08},
-	{"linux/raw.h",	"RAW_SETBIND",	0xac00},
-	{"linux/raw.h",	"RAW_GETBIND",	0xac01},
-	{"linux/if_pppox.h",	"PPPOEIOCSFWD",	0xb100},
-	{"linux/if_pppox.h",	"PPPOEIOCDFWD",	0xb101},
-	{"linux/reiserfs_fs.h",	"REISERFS_IOC_UNPACK",	0xcd01},
-	{"linux/lvm.h",	"VG_CREATE_OLD",	0xfe00},
-	{"linux/lvm.h",	"VG_REMOVE",	0xfe01},
-	{"linux/lvm.h",	"VG_EXTEND",	0xfe03},
-	{"linux/lvm.h",	"VG_REDUCE",	0xfe04},
-	{"linux/lvm.h",	"VG_STATUS",	0xfe05},
-	{"linux/lvm.h",	"VG_STATUS_GET_COUNT",	0xfe06},
-	{"linux/lvm.h",	"VG_STATUS_GET_NAMELIST",	0xfe07},
-	{"linux/lvm.h",	"VG_SET_EXTENDABLE",	0xfe08},
-	{"linux/lvm.h",	"VG_RENAME",	0xfe09},
-	{"linux/lvm.h",	"VG_CREATE",	0xfe0a},
-	{"linux/lvm.h",	"LV_CREATE",	0xfe20},
-	{"linux/lvm.h",	"LV_REMOVE",	0xfe21},
-	{"linux/lvm.h",	"LV_ACTIVATE",	0xfe22},
-	{"linux/lvm.h",	"LV_DEACTIVATE",	0xfe23},
-	{"linux/lvm.h",	"LV_EXTEND",	0xfe24},
-	{"linux/lvm.h",	"LV_REDUCE",	0xfe25},
-	{"linux/lvm.h",	"LV_STATUS_BYNAME",	0xfe26},
-	{"linux/lvm.h",	"LV_STATUS_BYINDEX",	0xfe27},
-	{"linux/lvm.h",	"LV_SET_ACCESS",	0xfe28},
-	{"linux/lvm.h",	"LV_SET_ALLOCATION",	0xfe29},
-	{"linux/lvm.h",	"LV_SET_STATUS",	0xfe2a},
-	{"linux/lvm.h",	"LE_REMAP",	0xfe2b},
-	{"linux/lvm.h",	"LV_SNAPSHOT_USE_RATE",	0xfe2c},
-	{"linux/lvm.h",	"LV_STATUS_BYDEV",	0xfe2e},
-	{"linux/lvm.h",	"LV_RENAME",	0xfe2f},
-	{"linux/lvm.h",	"LV_BMAP",	0xfe30},
-	{"linux/lvm.h",	"PV_STATUS",	0xfe40},
-	{"linux/lvm.h",	"PV_CHANGE",	0xfe41},
-	{"linux/lvm.h",	"PV_FLUSH",	0xfe42},
-	{"linux/lvm.h",	"PE_LOCK_UNLOCK",	0xfe50},
-	{"linux/lvm.h",	"LVM_GET_IOP_VERSION",	0xfe98},
-	{"linux/lvm.h",	"LVM_RESET",	0xfe99},
-	{"linux/lvm.h",	"LVM_LOCK_LVM",	0xff00},
--- a/linux/alpha/ioctlent.h.in
+++ b/linux/alpha/ioctlent.h.in
@ -0,0 +1,73 @@
+	{"asm/ioctls.h",	"TIOCEXCL",	0x540c},
+	{"asm/ioctls.h",	"TIOCNXCL",	0x540d},
+	{"asm/ioctls.h",	"TIOCSCTTY",	0x540e},
+	{"asm/ioctls.h",	"TIOCSTI",	0x5412},
+	{"asm/ioctls.h",	"TIOCMGET",	0x5415},
+	{"asm/ioctls.h",	"TIOCMBIS",	0x5416},
+	{"asm/ioctls.h",	"TIOCMBIC",	0x5417},
+	{"asm/ioctls.h",	"TIOCMSET",	0x5418},
+	{"asm/ioctls.h",	"TIOCGSOFTCAR",	0x5419},
+	{"asm/ioctls.h",	"TIOCSSOFTCAR",	0x541a},
+	{"asm/ioctls.h",	"TIOCLINUX",	0x541c},
+	{"asm/ioctls.h",	"TIOCCONS",	0x541d},
+	{"asm/ioctls.h",	"TIOCGSERIAL",	0x541e},
+	{"asm/ioctls.h",	"TIOCSSERIAL",	0x541f},
+	{"asm/ioctls.h",	"TIOCPKT",	0x5420},
+	{"asm/ioctls.h",	"TIOCNOTTY",	0x5422},
+	{"asm/ioctls.h",	"TIOCSETD",	0x5423},
+	{"asm/ioctls.h",	"TIOCGETD",	0x5424},
+	{"asm/ioctls.h",	"TCSBRKP",	0x5425},
+	{"asm/ioctls.h",	"TIOCTTYGSTRUCT",	0x5426},
+	{"asm/ioctls.h",	"TIOCSBRK",	0x5427},
+	{"asm/ioctls.h",	"TIOCCBRK",	0x5428},
+	{"asm/ioctls.h",	"TIOCGSID",	0x5429},
+	{"asm/ioctls.h",	"TIOCGPTN",	0x5430},
+	{"asm/ioctls.h",	"TIOCSPTLCK",	0x5431},
+	{"asm/ioctls.h",	"TIOCSERCONFIG",	0x5453},
+	{"asm/ioctls.h",	"TIOCSERGWILD",	0x5454},
+	{"asm/ioctls.h",	"TIOCSERSWILD",	0x5455},
+	{"asm/ioctls.h",	"TIOCGLCKTRMIOS",	0x5456},
+	{"asm/ioctls.h",	"TIOCSLCKTRMIOS",	0x5457},
+	{"asm/ioctls.h",	"TIOCSERGSTRUCT",	0x5458},
+	{"asm/ioctls.h",	"TIOCSERGETLSR",	0x5459},
+	{"asm/ioctls.h",	"TIOCSERGETMULTI",	0x545a},
+	{"asm/ioctls.h",	"TIOCSERSETMULTI",	0x545b},
+	{"asm/ioctls.h",	"TIOCMIWAIT",	0x545c},
+	{"asm/ioctls.h",	"TIOCGICOUNT",	0x545d},
+	{"asm/ioctls.h",	"TIOCGHAYESESP",	0x545e},
+	{"asm/ioctls.h",	"TIOCSHAYESESP",	0x545f},
+	{"asm/ioctls.h",	"FIOCLEX",	0x6601},
+	{"asm/ioctls.h",	"FIONCLEX",	0x6602},
+	{"asm/sockios.h",	"FIOGETOWN",	0x667b},
+	{"asm/sockios.h",	"FIOSETOWN",	0x667c},
+	{"asm/ioctls.h",	"FIOASYNC",	0x667d},
+	{"asm/ioctls.h",	"FIONBIO",	0x667e},
+	{"asm/ioctls.h",	"FIONREAD",	0x667f},
+	{"asm/sockios.h",	"SIOCATMARK",	0x7307},
+	{"asm/sockios.h",	"SIOCSPGRP",	0x7308},
+	{"asm/sockios.h",	"SIOCGPGRP",	0x7309},
+	{"asm/ioctls.h",	"TIOCGETP",	0x7408},
+	{"asm/ioctls.h",	"TIOCSETP",	0x7409},
+	{"asm/ioctls.h",	"TIOCSETN",	0x740a},
+	{"asm/ioctls.h",	"TIOCSETC",	0x7411},
+	{"asm/ioctls.h",	"TIOCGETC",	0x7412},
+	{"asm/ioctls.h",	"TCGETS",	0x7413},
+	{"asm/ioctls.h",	"TCSETS",	0x7414},
+	{"asm/ioctls.h",	"TCSETSW",	0x7415},
+	{"asm/ioctls.h",	"TCSETSF",	0x7416},
+	{"asm/ioctls.h",	"TCGETA",	0x7417},
+	{"asm/ioctls.h",	"TCSETA",	0x7418},
+	{"asm/ioctls.h",	"TCSETAW",	0x7419},
+	{"asm/ioctls.h",	"TCSETAF",	0x741c},
+	{"asm/ioctls.h",	"TCSBRK",	0x741d},
+	{"asm/ioctls.h",	"TCXONC",	0x741e},
+	{"asm/ioctls.h",	"TCFLSH",	0x741f},
+	{"asm/ioctls.h",	"TIOCSWINSZ",	0x7467},
+	{"asm/ioctls.h",	"TIOCGWINSZ",	0x7468},
+	{"asm/ioctls.h",	"TIOCSTART",	0x746e},
+	{"asm/ioctls.h",	"TIOCSTOP",	0x746f},
+	{"asm/ioctls.h",	"TIOCOUTQ",	0x7473},
+	{"asm/ioctls.h",	"TIOCGLTC",	0x7474},
+	{"asm/ioctls.h",	"TIOCSLTC",	0x7475},
+	{"asm/ioctls.h",	"TIOCSPGRP",	0x7476},
+	{"asm/ioctls.h",	"TIOCGPGRP",	0x7477},
--- a/linux/alpha/syscallent.h
+++ b/linux/alpha/syscallent.h
@ -24,8 +24,6 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id$
 */

 	{ 6,	0,	printargs,		"osf_syscall"		}, /* 0, not implemented */
@ -52,7 +50,7 @@
 	{ 4,	0,	printargs,		"osf_mount"		}, /* 21 */
 	{ 2,	0,	sys_umount2,		"umount"		}, /* 22 */
 	{ 1,	0,	sys_setuid,		"setuid"		}, /* 23 */
-	{ 0,	0,	sys_getuid,		"getxuid"		}, /* 24 */
+	{ 0,	NF,	sys_getuid,		"getxuid"		}, /* 24 */
 	{ 5,	0,	printargs,		"exec_with_loader"	}, /* 25, not implemented */
 	{ 4,	0,	sys_ptrace,		"ptrace"		}, /* 26 */
 	{ 5,	0,	printargs,		"osf_nrecvmsg"		}, /* 27, not implemented */
@ -75,13 +73,13 @@
 	{ 5,	0,	printargs,		"osf_profil"		}, /* 44, not implemented */
 	{ 3,	TD|TF,	sys_open,		"open"			}, /* 45 */
 	{ 5,	0,	printargs,		"osf_old_sigaction"	}, /* 46, not implemented */
-	{ 1,	0,	sys_getgid,		"getxgid"		}, /* 47 */
-	{ 3,	TS,	printargs,		"osf_sigprocmask"	}, /* 48 */
+	{ 1,	NF,	sys_getgid,		"getxgid"		}, /* 47 */
+	{ 2,	TS,	sys_sigprocmask,	"osf_sigprocmask"	}, /* 48 */
 	{ 5,	0,	printargs,		"osf_getlogin"		}, /* 49, not implemented */
 	{ 5,	0,	printargs,		"osf_setlogin"		}, /* 50, not implemented */
 	{ 1,	TF,	sys_acct,		"acct"			}, /* 51 */
 	{ 1,	TS,	sys_sigpending,		"sigpending"		}, /* 52 */
-	{ 5,	0,	printargs,		"SYS_53"		}, /* 53 */
+	{ 5,	0,	NULL,			NULL			}, /* 53 */
 	{ 3,	TD,	sys_ioctl,		"ioctl"			}, /* 54 */
 	{ 5,	0,	printargs,		"osf_reboot"		}, /* 55, not implemented */
 	{ 5,	0,	printargs,		"osf_revoke"		}, /* 56, not implemented */
@ -99,7 +97,7 @@
 	{ 2,	TF,	sys_lstat,		"lstat"			}, /* 68 */
 	{ 5,	0,	printargs,		"osf_sbrk"		}, /* 69, not implemented */
 	{ 5,	0,	printargs,		"osf_sstk"		}, /* 70, not implemented */
-	{ 6,	0,	sys_mmap,		"mmap"			}, /* 71 */
+	{ 6,	TD,	sys_mmap,		"mmap"			}, /* 71 */
 	{ 5,	0,	printargs,		"osf_old_vadvise"	}, /* 72, not implemented */
 	{ 2,	0,	sys_munmap,		"munmap"		}, /* 73 */
 	{ 3,	0,	sys_mprotect,		"mprotect"		}, /* 74 */
@ -131,7 +129,7 @@
 	{ 2,	0,	sys_getpriority,	"osf_getpriority"	}, /* 100 */
 	{ 4,	TN,	sys_send,		"send"			}, /* 101 */
 	{ 4,	TN,	sys_recv,		"recv"			}, /* 102 */
-	{ 1,	TS,	sys_sigreturn,		"sigreturn"		}, /* 103 */
+	{ 0,	TS,	sys_sigreturn,		"sigreturn"		}, /* 103 */
 	{ 3,	TN,	sys_bind,		"bind"			}, /* 104 */
 	{ 5,	TN,	sys_setsockopt,		"setsockopt"		}, /* 105 */
 	{ 2,	TN,	sys_listen,		"listen"		}, /* 106 */
@ -147,7 +145,7 @@
 	{ 2,	0,	sys_osf_gettimeofday,	"osf_gettimeofday"	}, /* 116 */
 	{ 2,	0,	sys_osf_getrusage,	"osf_getrusage"		}, /* 117 */
 	{ 5,	TN,	sys_getsockopt,		"getsockopt"		}, /* 118 */
-	{ 5,	0,	printargs,		"SYS_119"		}, /* 119 */
+	{ 5,	0,	NULL,			NULL			}, /* 119 */
 	{ 3,	TD,	sys_readv,		"readv"			}, /* 120 */
 	{ 3,	TD,	sys_writev,		"writev"		}, /* 121 */
 	{ 2,	0,	sys_osf_settimeofday,	"osf_settimeofday"	}, /* 122 */
@ -179,54 +177,54 @@
 	{ 4,	0,	sys_quotactl,		"quotactl"		}, /* 148 */
 	{ 5,	0,	printargs,		"osf_oldquota"		}, /* 149, not implemented */
 	{ 3,	TN,	sys_getsockname,	"getsockname"		}, /* 150 */
-	{ 5,	0,	printargs,		"SYS_151"		}, /* 151 */
-	{ 5,	0,	printargs,		"SYS_152"		}, /* 152 */
+	{ 5,	0,	NULL,			NULL			}, /* 151 */
+	{ 5,	0,	NULL,			NULL			}, /* 152 */
 	{ 5,	0,	printargs,		"osf_pid_block"		}, /* 153, not implemented */
 	{ 5,	0,	printargs,		"osf_pid_unblock"	}, /* 154, not implemented */
-	{ 5,	0,	printargs,		"SYS_155"		}, /* 155 */
+	{ 5,	0,	NULL,			NULL			}, /* 155 */
 	{ 3,	TS,	sys_sigaction,		"sigaction"		}, /* 156 */
 	{ 5,	0,	printargs,		"osf_sigwaitprim"	}, /* 157, not implemented */
 	{ 5,	0,	printargs,		"osf_nfssvc"		}, /* 158, not implemented */
 	{ 4,	0,	printargs,		"osf_getdirentries"	}, /* 159 */
 	{ 3,	0,	osf_statfs,		"osf_statfs"		}, /* 160 */
 	{ 3,	0,	osf_fstatfs,		"osf_fstatfs"		}, /* 161 */
-	{ 5,	0,	printargs,		"SYS_162"		}, /* 162 */
+	{ 5,	0,	NULL,			NULL			}, /* 162 */
 	{ 5,	0,	printargs,		"osf_asynch_daemon"	}, /* 163, not implemented */
 	{ 5,	0,	printargs,		"osf_getfh"		}, /* 164, not implemented */
 	{ 2,	0,	printargs,		"osf_getdomainname"	}, /* 165 */
 	{ 2,	0,	sys_setdomainname,	"setdomainname"		}, /* 166 */
-	{ 5,	0,	printargs,		"SYS_167"		}, /* 167 */
-	{ 5,	0,	printargs,		"SYS_168"		}, /* 168 */
+	{ 5,	0,	NULL,			NULL			}, /* 167 */
+	{ 5,	0,	NULL,			NULL			}, /* 168 */
 	{ 5,	0,	printargs,		"osf_exportfs"		}, /* 169, not implemented */
-	{ 5,	0,	printargs,		"SYS_170"		}, /* 170 */
-	{ 5,	0,	printargs,		"SYS_171"		}, /* 171 */
-	{ 5,	0,	printargs,		"SYS_172"		}, /* 172 */
-	{ 5,	0,	printargs,		"SYS_173"		}, /* 173 */
-	{ 5,	0,	printargs,		"SYS_174"		}, /* 174 */
-	{ 5,	0,	printargs,		"SYS_175"		}, /* 175 */
-	{ 5,	0,	printargs,		"SYS_176"		}, /* 176 */
-	{ 5,	0,	printargs,		"SYS_177"		}, /* 177 */
-	{ 5,	0,	printargs,		"SYS_178"		}, /* 178 */
-	{ 5,	0,	printargs,		"SYS_179"		}, /* 179 */
-	{ 5,	0,	printargs,		"SYS_180"		}, /* 180 */
+	{ 5,	0,	NULL,			NULL			}, /* 170 */
+	{ 5,	0,	NULL,			NULL			}, /* 171 */
+	{ 5,	0,	NULL,			NULL			}, /* 172 */
+	{ 5,	0,	NULL,			NULL			}, /* 173 */
+	{ 5,	0,	NULL,			NULL			}, /* 174 */
+	{ 5,	0,	NULL,			NULL			}, /* 175 */
+	{ 5,	0,	NULL,			NULL			}, /* 176 */
+	{ 5,	0,	NULL,			NULL			}, /* 177 */
+	{ 5,	0,	NULL,			NULL			}, /* 178 */
+	{ 5,	0,	NULL,			NULL			}, /* 179 */
+	{ 5,	0,	NULL,			NULL			}, /* 180 */
 	{ 5,	0,	printargs,		"osf_alt_plock"		}, /* 181, not implemented */
-	{ 5,	0,	printargs,		"SYS_182"		}, /* 182 */
-	{ 5,	0,	printargs,		"SYS_183"		}, /* 183 */
+	{ 5,	0,	NULL,			NULL			}, /* 182 */
+	{ 5,	0,	NULL,			NULL			}, /* 183 */
 	{ 5,	0,	printargs,		"osf_getmnt"		}, /* 184, not implemented */
-	{ 5,	0,	printargs,		"SYS_185"		}, /* 185 */
-	{ 5,	0,	printargs,		"SYS_186"		}, /* 186 */
+	{ 5,	0,	NULL,			NULL			}, /* 185 */
+	{ 5,	0,	NULL,			NULL			}, /* 186 */
 	{ 5,	0,	printargs,		"osf_alt_sigpending"	}, /* 187, not implemented */
 	{ 5,	0,	printargs,		"osf_alt_setsid"	}, /* 188, not implemented */
-	{ 5,	0,	printargs,		"SYS_189"		}, /* 189 */
-	{ 5,	0,	printargs,		"SYS_190"		}, /* 190 */
-	{ 5,	0,	printargs,		"SYS_191"		}, /* 191 */
-	{ 5,	0,	printargs,		"SYS_192"		}, /* 192 */
-	{ 5,	0,	printargs,		"SYS_193"		}, /* 193 */
-	{ 5,	0,	printargs,		"SYS_194"		}, /* 194 */
-	{ 5,	0,	printargs,		"SYS_195"		}, /* 195 */
-	{ 5,	0,	printargs,		"SYS_196"		}, /* 196 */
-	{ 5,	0,	printargs,		"SYS_197"		}, /* 197 */
-	{ 5,	0,	printargs,		"SYS_198"		}, /* 198 */
+	{ 5,	0,	NULL,			NULL			}, /* 189 */
+	{ 5,	0,	NULL,			NULL			}, /* 190 */
+	{ 5,	0,	NULL,			NULL			}, /* 191 */
+	{ 5,	0,	NULL,			NULL			}, /* 192 */
+	{ 5,	0,	NULL,			NULL			}, /* 193 */
+	{ 5,	0,	NULL,			NULL			}, /* 194 */
+	{ 5,	0,	NULL,			NULL			}, /* 195 */
+	{ 5,	0,	NULL,			NULL			}, /* 196 */
+	{ 5,	0,	NULL,			NULL			}, /* 197 */
+	{ 5,	0,	NULL,			NULL			}, /* 198 */
 	{ 4,	0,	printargs,		"osf_swapon"		}, /* 199 */
 	{ 4,	TI,	sys_msgctl,		"msgctl"		}, /* 200 */
 	{ 4,	TI,	sys_msgget,		"msgget"		}, /* 201 */
@ -249,18 +247,18 @@
 	{ 5,	0,	printargs,		"osf_signal"		}, /* 218, not implemented */
 	{ 5,	0,	printargs,		"osf_utc_gettime"	}, /* 219, not implemented */
 	{ 5,	0,	printargs,		"osf_utc_adjtime"	}, /* 220, not implemented */
-	{ 5,	0,	printargs,		"SYS_221"		}, /* 221 */
+	{ 5,	0,	NULL,			NULL			}, /* 221 */
 	{ 5,	0,	printargs,		"osf_security"		}, /* 222, not implemented */
 	{ 5,	0,	printargs,		"osf_kloadcall"		}, /* 223, not implemented */
-	{ 5,	0,	printargs,		"SYS_224"		}, /* 224 */
-	{ 5,	0,	printargs,		"SYS_225"		}, /* 225 */
-	{ 5,	0,	printargs,		"SYS_226"		}, /* 226 */
-	{ 5,	0,	printargs,		"SYS_227"		}, /* 227 */
-	{ 5,	0,	printargs,		"SYS_228"		}, /* 228 */
-	{ 5,	0,	printargs,		"SYS_229"		}, /* 229 */
-	{ 5,	0,	printargs,		"SYS_230"		}, /* 230 */
-	{ 5,	0,	printargs,		"SYS_231"		}, /* 231 */
-	{ 5,	0,	printargs,		"SYS_232"		}, /* 232 */
+	{ 5,	0,	NULL,			NULL			}, /* 224 */
+	{ 5,	0,	NULL,			NULL			}, /* 225 */
+	{ 5,	0,	NULL,			NULL			}, /* 226 */
+	{ 5,	0,	NULL,			NULL			}, /* 227 */
+	{ 5,	0,	NULL,			NULL			}, /* 228 */
+	{ 5,	0,	NULL,			NULL			}, /* 229 */
+	{ 5,	0,	NULL,			NULL			}, /* 230 */
+	{ 5,	0,	NULL,			NULL			}, /* 231 */
+	{ 5,	0,	NULL,			NULL			}, /* 232 */
 	{ 1,	0,	sys_getpgid,		"getpgid"		}, /* 233 */
 	{ 1,	0,	sys_getsid,		"getsid"		}, /* 234 */
 	{ 5,	0,	sys_sigaltstack,	"sigaltstack"		}, /* 235 */
@ -277,7 +275,7 @@
 	{ 5,	0,	printargs,		"osf_ntp_gettime"	}, /* 246, not implemented */
 	{ 5,	0,	printargs,		"osf_pathconf"		}, /* 247, not implemented */
 	{ 5,	0,	printargs,		"osf_fpathconf"		}, /* 248, not implemented */
-	{ 5,	0,	printargs,		"SYS_249"		}, /* 249 */
+	{ 5,	0,	NULL,			NULL			}, /* 249 */
 	{ 5,	0,	printargs,		"osf_uswitch"		}, /* 250, not implemented */
 	{ 2,	0,	printargs,		"osf_usleep_thread"	}, /* 251 */
 	{ 5,	0,	printargs,		"osf_audcntl"		}, /* 252, not implemented */
@ -290,56 +288,56 @@
 	{ 5,	0,	printargs,		"osf_swapctl"		}, /* 259, not implemented */
 	{ 5,	0,	printargs,		"osf_memcntl"		}, /* 260, not implemented */
 	{ 5,	0,	printargs,		"osf_fdatasync"		}, /* 261, not implemented */
-	{ 5,	0,	printargs,		"SYS_262"		}, /* 262 */
-	{ 5,	0,	printargs,		"SYS_263"		}, /* 263 */
-	{ 5,	0,	printargs,		"SYS_264"		}, /* 264 */
-	{ 5,	0,	printargs,		"SYS_265"		}, /* 265 */
-	{ 5,	0,	printargs,		"SYS_266"		}, /* 266 */
-	{ 5,	0,	printargs,		"SYS_267"		}, /* 267 */
-	{ 5,	0,	printargs,		"SYS_268"		}, /* 268 */
-	{ 5,	0,	printargs,		"SYS_269"		}, /* 269 */
-	{ 5,	0,	printargs,		"SYS_270"		}, /* 270 */
-	{ 5,	0,	printargs,		"SYS_271"		}, /* 271 */
-	{ 5,	0,	printargs,		"SYS_272"		}, /* 272 */
-	{ 5,	0,	printargs,		"SYS_273"		}, /* 273 */
-	{ 5,	0,	printargs,		"SYS_274"		}, /* 274 */
-	{ 5,	0,	printargs,		"SYS_275"		}, /* 275 */
-	{ 5,	0,	printargs,		"SYS_276"		}, /* 276 */
-	{ 5,	0,	printargs,		"SYS_277"		}, /* 277 */
-	{ 5,	0,	printargs,		"SYS_278"		}, /* 278 */
-	{ 5,	0,	printargs,		"SYS_279"		}, /* 279 */
-	{ 5,	0,	printargs,		"SYS_280"		}, /* 280 */
-	{ 5,	0,	printargs,		"SYS_281"		}, /* 281 */
-	{ 5,	0,	printargs,		"SYS_282"		}, /* 282 */
-	{ 5,	0,	printargs,		"SYS_283"		}, /* 283 */
-	{ 5,	0,	printargs,		"SYS_284"		}, /* 284 */
-	{ 5,	0,	printargs,		"SYS_285"		}, /* 285 */
-	{ 5,	0,	printargs,		"SYS_286"		}, /* 286 */
-	{ 5,	0,	printargs,		"SYS_287"		}, /* 287 */
-	{ 5,	0,	printargs,		"SYS_288"		}, /* 288 */
-	{ 5,	0,	printargs,		"SYS_289"		}, /* 289 */
-	{ 5,	0,	printargs,		"SYS_290"		}, /* 290 */
-	{ 5,	0,	printargs,		"SYS_291"		}, /* 291 */
-	{ 5,	0,	printargs,		"SYS_292"		}, /* 292 */
-	{ 5,	0,	printargs,		"SYS_293"		}, /* 293 */
-	{ 5,	0,	printargs,		"SYS_294"		}, /* 294 */
-	{ 5,	0,	printargs,		"SYS_295"		}, /* 295 */
-	{ 5,	0,	printargs,		"SYS_296"		}, /* 296 */
-	{ 5,	0,	printargs,		"SYS_297"		}, /* 297 */
-	{ 5,	0,	printargs,		"SYS_298"		}, /* 298 */
-	{ 5,	0,	printargs,		"SYS_299"		}, /* 299 */
+	{ 5,	0,	NULL,			NULL			}, /* 262 */
+	{ 5,	0,	NULL,			NULL			}, /* 263 */
+	{ 5,	0,	NULL,			NULL			}, /* 264 */
+	{ 5,	0,	NULL,			NULL			}, /* 265 */
+	{ 5,	0,	NULL,			NULL			}, /* 266 */
+	{ 5,	0,	NULL,			NULL			}, /* 267 */
+	{ 5,	0,	NULL,			NULL			}, /* 268 */
+	{ 5,	0,	NULL,			NULL			}, /* 269 */
+	{ 5,	0,	NULL,			NULL			}, /* 270 */
+	{ 5,	0,	NULL,			NULL			}, /* 271 */
+	{ 5,	0,	NULL,			NULL			}, /* 272 */
+	{ 5,	0,	NULL,			NULL			}, /* 273 */
+	{ 5,	0,	NULL,			NULL			}, /* 274 */
+	{ 5,	0,	NULL,			NULL			}, /* 275 */
+	{ 5,	0,	NULL,			NULL			}, /* 276 */
+	{ 5,	0,	NULL,			NULL			}, /* 277 */
+	{ 5,	0,	NULL,			NULL			}, /* 278 */
+	{ 5,	0,	NULL,			NULL			}, /* 279 */
+	{ 5,	0,	NULL,			NULL			}, /* 280 */
+	{ 5,	0,	NULL,			NULL			}, /* 281 */
+	{ 5,	0,	NULL,			NULL			}, /* 282 */
+	{ 5,	0,	NULL,			NULL			}, /* 283 */
+	{ 5,	0,	NULL,			NULL			}, /* 284 */
+	{ 5,	0,	NULL,			NULL			}, /* 285 */
+	{ 5,	0,	NULL,			NULL			}, /* 286 */
+	{ 5,	0,	NULL,			NULL			}, /* 287 */
+	{ 5,	0,	NULL,			NULL			}, /* 288 */
+	{ 5,	0,	NULL,			NULL			}, /* 289 */
+	{ 5,	0,	NULL,			NULL			}, /* 290 */
+	{ 5,	0,	NULL,			NULL			}, /* 291 */
+	{ 5,	0,	NULL,			NULL			}, /* 292 */
+	{ 5,	0,	NULL,			NULL			}, /* 293 */
+	{ 5,	0,	NULL,			NULL			}, /* 294 */
+	{ 5,	0,	NULL,			NULL			}, /* 295 */
+	{ 5,	0,	NULL,			NULL			}, /* 296 */
+	{ 5,	0,	NULL,			NULL			}, /* 297 */
+	{ 5,	0,	NULL,			NULL			}, /* 298 */
+	{ 5,	0,	NULL,			NULL			}, /* 299 */
 	{ 0,	0,	sys_bdflush,		"bdflush"		}, /* 300 */
 	{ 3,	0,	printargs,		"sethae"		}, /* 301 */
 	{ 5,	TF,	sys_mount,		"mount"			}, /* 302 */
 	{ 1,	0,	sys_adjtimex,		"adjtimex32"		}, /* 303 */
-	{ 1,	0,	sys_swapoff,		"swapoff"		}, /* 304 */
+	{ 1,	TF,	sys_swapoff,		"swapoff"		}, /* 304 */
 	{ 3,	TD,	sys_getdents,		"getdents"		}, /* 305 */
 	{ 2,	0,	sys_create_module,	"create_module"		}, /* 306 */
 	{ 4,	0,	sys_init_module,	"init_module"		}, /* 307 */
 	{ 2,	0,	sys_delete_module,	"delete_module"		}, /* 308 */
 	{ 1,	0,	sys_get_kernel_syms,	"get_kernel_syms"	}, /* 309 */
 	{ 3,	0,	sys_syslog,		"syslog"		}, /* 310 */
-	{ 3,	0,	sys_reboot,		"reboot"		}, /* 311 */
+	{ 4,	0,	sys_reboot,		"reboot"		}, /* 311 */
 	{ 5,	TP,	sys_clone,		"clone"			}, /* 312 */
 	{ 1,	0,	sys_uselib,		"uselib"		}, /* 313 */
 	{ 2,	0,	sys_mlock,		"mlock"			}, /* 314 */
@ -350,11 +348,11 @@
 	{ 1,	0,	sys_sysctl,		"sysctl"		}, /* 319 */
 	{ 0,	0,	sys_idle,		"idle"			}, /* 320 */
 	{ 1,	0,	sys_umount,		"oldumount"		}, /* 321 */
-	{ 1,	0,	sys_swapon,		"swapon"		}, /* 322 */
+	{ 2,	TF,	sys_swapon,		"swapon"		}, /* 322 */
 	{ 1,	0,	sys_times,		"times"			}, /* 323 */
 	{ 1,	0,	sys_personality,	"personality"		}, /* 324 */
-	{ 1,	0,	sys_setfsuid,		"setfsuid"		}, /* 325 */
-	{ 1,	0,	sys_setfsgid,		"setfsgid"		}, /* 326 */
+	{ 1,	NF,	sys_setfsuid,		"setfsuid"		}, /* 325 */
+	{ 1,	NF,	sys_setfsgid,		"setfsgid"		}, /* 326 */
 	{ 2,	0,	sys_ustat,		"ustat"			}, /* 327 */
 	{ 2,	TF,	sys_statfs,		"statfs"		}, /* 328 */
 	{ 2,	TD,	sys_fstatfs,		"fstatfs"		}, /* 329 */
@ -370,7 +368,7 @@
 	{ 1,	0,	sys_uname,		"uname"			}, /* 339 */
 	{ 2,	0,	sys_nanosleep,		"nanosleep"		}, /* 340 */
 	{ 5,	0,	sys_mremap,		"mremap"		}, /* 341 */
-	{ 5,	0,	printargs,		"nfsservctl"		}, /* 342 */
+	{ 5,	0,	sys_nfsservctl,		"nfsservctl"		}, /* 342 */
 	{ 3,	0,	sys_setresuid,		"setresuid"		}, /* 343 */
 	{ 3,	0,	sys_getresuid,		"getresuid"		}, /* 344 */
 	{ 5,	0,	printargs,		"pciconfig_read"	}, /* 345 */
@ -379,7 +377,7 @@
 	{ 5,	0,	sys_prctl,		"prctl"			}, /* 348 */
 	{ 5,	TD,	sys_pread,		"pread"			}, /* 349 */
 	{ 5,	TD,	sys_pwrite,		"pwrite"		}, /* 350 */
-	{ 1,	TS,	printargs,		"rt_sigreturn"		}, /* 351 */
+	{ 0,	TS,	sys_rt_sigreturn,	"rt_sigreturn"		}, /* 351 */
 	{ 4,	TS,	sys_rt_sigaction,	"rt_sigaction"		}, /* 352 */
 	{ 4,	TS,	sys_rt_sigprocmask,	"rt_sigprocmask"	}, /* 353 */
 	{ 2,	TS,	sys_rt_sigpending,	"rt_sigpending"		}, /* 354 */
@ -406,42 +404,42 @@
 	{ 3,	0,	sys_mincore,		"mincore"		}, /* 375 */
 	{ 3,	0,	printargs,		"pciconfig_iobase"	}, /* 376 */
 	{ 3,	TD,	sys_getdents64,		"getdents64"		}, /* 377 */
-	{ 0,	0,	printargs,		"gettid"		}, /* 378 */
+	{ 0,	0,	sys_gettid,		"gettid"		}, /* 378 */
 	{ 4,	TD,	sys_readahead,		"readahead"		}, /* 379 */
-	{ 5,	0,	printargs,		"SYS_380"		}, /* 380 */
+	{ 5,	0,	NULL,			NULL			}, /* 380 */
 	{ 2,	TS,	sys_kill,		"tkill"			}, /* 381 */
 	{ 5,	TF,	sys_setxattr,		"setxattr"		}, /* 382 */
 	{ 5,	TF,	sys_setxattr,		"lsetxattr"		}, /* 383 */
 	{ 5,	TD,	sys_fsetxattr,		"fsetxattr"		}, /* 384 */
 	{ 4,	TF,	sys_getxattr,		"getxattr"		}, /* 385 */
 	{ 4,	TF,	sys_getxattr,		"lgetxattr"		}, /* 386 */
-	{ 4,	0,	sys_fgetxattr,		"fgetxattr"		}, /* 387 */
+	{ 4,	TD,	sys_fgetxattr,		"fgetxattr"		}, /* 387 */
 	{ 3,	TF,	sys_listxattr,		"listxattr"		}, /* 388 */
 	{ 3,	TF,	sys_listxattr,		"llistxattr"		}, /* 389 */
-	{ 3,	0,	sys_flistxattr,		"flistxattr"		}, /* 390 */
+	{ 3,	TD,	sys_flistxattr,		"flistxattr"		}, /* 390 */
 	{ 2,	TF,	sys_removexattr,	"removexattr"		}, /* 391 */
 	{ 2,	TF,	sys_removexattr,	"lremovexattr"		}, /* 392 */
 	{ 2,	TD,	sys_fremovexattr,	"fremovexattr"		}, /* 393 */
 	{ 6,	0,	sys_futex,		"futex"			}, /* 394 */
 	{ 3,	0,	sys_sched_setaffinity,	"sched_setaffinity"	}, /* 395 */
 	{ 3,	0,	sys_sched_getaffinity,	"sched_getaffinity"	}, /* 396 */
-	{ 5,	0,	printargs,		"tuxcall"		}, /* 397 */
+	{ 5,	0,	sys_tuxcall,		"tuxcall"		}, /* 397 */
 	{ 2,	0,	sys_io_setup,		"io_setup"		}, /* 398 */
 	{ 1,	0,	sys_io_destroy,		"io_destroy"		}, /* 399 */
 	{ 5,	0,	sys_io_getevents,		"io_getevents"		}, /* 400 */
 	{ 3,	0,	sys_io_submit,		"io_submit"		}, /* 401 */
 	{ 3,	0,	sys_io_cancel,		"io_cancel"		}, /* 402 */
-	{ 5,	0,	printargs,		"SYS_403"		}, /* 403 */
-	{ 5,	0,	printargs,		"SYS_404"		}, /* 404 */
+	{ 5,	0,	NULL,			NULL			}, /* 403 */
+	{ 5,	0,	NULL,			NULL			}, /* 404 */
 	{ 1,	TP,	sys_exit,		"exit_group"		}, /* 405 */
-	{ 4,	0,	printargs,		"lookup_dcookie"	}, /* 406 */
-	{ 1,	0,	sys_epoll_create,	"epoll_create"		}, /* 407 */
+	{ 4,	0,	sys_lookup_dcookie,	"lookup_dcookie"	}, /* 406 */
+	{ 1,	TD,	sys_epoll_create,	"epoll_create"		}, /* 407 */
 	{ 4,	TD,	sys_epoll_ctl,		"epoll_ctl"		}, /* 408 */
 	{ 4,	TD,	sys_epoll_wait,		"epoll_wait"		}, /* 409 */
 	{ 5,	0,	sys_remap_file_pages,	"remap_file_pages"	}, /* 410 */
-	{ 1,	0,	printargs,		"set_tid_address"	}, /* 411 */
+	{ 1,	0,	sys_set_tid_address,	"set_tid_address"	}, /* 411 */
 	{ 0,	0,	sys_restart_syscall,	"restart_syscall"	}, /* 412 */
-	{ 4,	0,	printargs,		"fadvise"		}, /* 413 */
+	{ 4,	TD,	printargs,		"fadvise"		}, /* 413 */
 	{ 3,	0,	sys_timer_create,	"timer_create"		}, /* 414 */
 	{ 4,	0,	sys_timer_settime,	"timer_settime"		}, /* 415 */
 	{ 2,	0,	sys_timer_gettime,	"timer_gettime"		}, /* 416 */
@ -456,7 +454,7 @@
 	{ 2,	TF,	sys_stat64,		"stat64"		}, /* 425 */
 	{ 2,	TF,	sys_lstat64,		"lstat64"		}, /* 426 */
 	{ 2,	TD,	sys_fstat64,		"fstat64"		}, /* 427 */
-	{ 5,	0,	printargs,		"vserver"		}, /* 428 ??? */
+	{ 5,	0,	sys_vserver,		"vserver"		}, /* 428 ??? */
 	{ 5,	0,	printargs,		"mbind"			}, /* 429 ??? */
 	{ 5,	0,	printargs,		"get_mempolicy"		}, /* 430 ??? */
 	{ 5,	0,	printargs,		"set_mempolicy"		}, /* 431 ??? */
@ -467,11 +465,68 @@
 	{ 2,	0,	sys_mq_notify,		"mq_notify"		}, /* 436 */
 	{ 3,	0,	sys_mq_getsetattr,	"mq_getsetattr"		}, /* 437 */
 	{ 4,	0,	printargs,		"waitid"		}, /* 438 */
-	{ 5,	0,	printargs,		"add_key"		}, /* 439 */
-	{ 4,	0,	printargs,		"request_key"		}, /* 440 */
-	{ 5,	0,	printargs,		"keyctl"		}, /* 441 */
-	{ 3,	0,	printargs,		"ioprio_set"		}, /* 442 */
-	{ 2,	0,	printargs,		"ioprio_get"		}, /* 443 */
-	{ 0,	TD,	printargs,		"inotify_init"		}, /* 444 */
+	{ 5,	0,	sys_add_key,		"add_key"		}, /* 439 */
+	{ 4,	0,	sys_request_key,	"request_key"		}, /* 440 */
+	{ 5,	0,	sys_keyctl,		"keyctl"		}, /* 441 */
+	{ 3,	0,	sys_ioprio_set,		"ioprio_set"		}, /* 442 */
+	{ 2,	0,	sys_ioprio_get,		"ioprio_get"		}, /* 443 */
+	{ 0,	TD,	sys_inotify_init,	"inotify_init"		}, /* 444 */
 	{ 3,	TD,	sys_inotify_add_watch,	"inotify_add_watch"	}, /* 445 */
 	{ 2,	TD,	sys_inotify_rm_watch,	"inotify_rm_watch"	}, /* 446 */
+	{ 1,	TD,	sys_fdatasync,		"fdatasync"		}, /* 447 */
+	{ 4,	0,	sys_kexec_load,		"kexec_load"		}, /* 448 */
+	{ 4,	0,	sys_migrate_pages,	"migrate_pages"		}, /* 449 */
+	{ 4,	TD|TF,	sys_openat,		"openat"		}, /* 450 */
+	{ 3,	TD|TF,	sys_mkdirat,		"mkdirat"		}, /* 451 */
+	{ 4,	TD|TF,	sys_mknodat,		"mknodat"		}, /* 452 */
+	{ 5,	TD|TF,	sys_fchownat,		"fchownat"		}, /* 453 */
+	{ 3,	TD|TF,	sys_futimesat,		"futimesat"		}, /* 454 */
+	{ 4,	TD|TF,	sys_newfstatat,		"newfstatat"		}, /* 455 */
+	{ 3,	TD|TF,	sys_unlinkat,		"unlinkat"		}, /* 456 */
+	{ 4,	TD|TF,	sys_renameat,		"renameat"		}, /* 457 */
+	{ 5,	TD|TF,	sys_linkat,		"linkat"		}, /* 458 */
+	{ 3,	TD|TF,	sys_symlinkat,		"symlinkat"		}, /* 459 */
+	{ 4,	TD|TF,	sys_readlinkat,		"readlinkat"		}, /* 460 */
+	{ 3,	TD|TF,	sys_fchmodat,		"fchmodat"		}, /* 461 */
+	{ 3,	TD|TF,	sys_faccessat,		"faccessat"		}, /* 462 */
+	{ 6,	TD,	sys_pselect6,		"pselect6"		}, /* 463 */
+	{ 5,	TD,	sys_ppoll,		"ppoll"			}, /* 464 */
+	{ 1,	TP,	sys_unshare,		"unshare"		}, /* 465 */
+	{ 2,	0,	sys_set_robust_list,	"set_robust_list"	}, /* 466 */
+	{ 3,	0,	sys_get_robust_list,	"get_robust_list"	}, /* 467 */
+	{ 6,	TD,	sys_splice,		"splice"		}, /* 468 */
+	{ 4,	TD,	sys_sync_file_range,	"sync_file_range"	}, /* 469 */
+	{ 4,	TD,	sys_tee,		"tee"			}, /* 470 */
+	{ 4,	TD,	sys_vmsplice,		"vmsplice"		}, /* 471 */
+	{ 6,	0,	sys_move_pages,		"move_pages"		}, /* 472 */
+	{ 3,	0,	sys_getcpu,		"getcpu"		}, /* 473 */
+	{ 6,	TD,	sys_epoll_pwait,	"epoll_pwait"		}, /* 474 */
+	{ 4,	TD|TF,	sys_utimensat,		"utimensat"		}, /* 475 */
+	{ 3,	TD|TS,	sys_signalfd,		"signalfd"		}, /* 476 */
+	{ 4,	TD,	sys_timerfd,		"timerfd"		}, /* 477 */
+	{ 1,	TD,	sys_eventfd,		"eventfd"		}, /* 478 */
+	{ 5,	TN,	sys_recvmmsg,		"recvmmsg"		}, /* 479 */
+	{ 6,	TD,	sys_fallocate,		"fallocate"		}, /* 480 */
+	{ 2,	TD,	sys_timerfd_create,	"timerfd_create"	}, /* 481 */
+	{ 4,	TD,	sys_timerfd_settime,	"timerfd_settime"	}, /* 482 */
+	{ 2,	TD,	sys_timerfd_gettime,	"timerfd_gettime"	}, /* 483 */
+	{ 4,	TD|TS,	sys_signalfd4,		"signalfd4"		}, /* 484 */
+	{ 2,	TD,	sys_eventfd2,		"eventfd2"		}, /* 485 */
+	{ 1,	TD,	sys_epoll_create1,	"epoll_create1"		}, /* 486 */
+	{ 3,	TD,	sys_dup3,		"dup3"			}, /* 487 */
+	{ 2,	TD,	sys_pipe2,		"pipe2"			}, /* 488 */
+	{ 1,	TD,	sys_inotify_init1,	"inotify_init1"		}, /* 489 */
+	{ 5,	TD,	sys_preadv,		"preadv"		}, /* 490 */
+	{ 5,	TD,	sys_pwritev,		"pwritev"		}, /* 491 */
+	{ 4,	TP|TS,	sys_rt_tgsigqueueinfo,	"rt_tgsigqueueinfo"	}, /* 492 */
+	{ 5,	TD,	sys_perf_event_open,	"perf_event_open"	}, /* 493 */
+	{ 2,	TD,	sys_fanotify_init,	"fanotify_init"		}, /* 494 */
+	{ 5,	TD|TF,	sys_fanotify_mark,	"fanotify_mark"		}, /* 495 */
+	{ 4,	0,	sys_prlimit64,		"prlimit64"		}, /* 496 */
+	{ 5,	TD|TF,	sys_name_to_handle_at,	"name_to_handle_at"	}, /* 497 */
+	{ 3,	TD,	sys_open_by_handle_at,	"open_by_handle_at"	}, /* 498 */
+	{ 2,	0,	sys_clock_adjtime,	"clock_adjtime"		}, /* 499 */
+	{ 1,	TD,	sys_syncfs,		"syncfs"		}, /* 500 */
+	{ 2,	TD,	sys_setns,		"setns"			}, /* 501 */
+	{ 4,	TN,	sys_accept4,		"accept4"		}, /* 502 */
+	{ 4,	TN,	sys_sendmmsg,		"sendmmsg"		}, /* 503 */
--- a/linux/arm/ioctlent.h.in
+++ b/linux/arm/ioctlent.h.in
@ -0,0 +1 @@
+#include "../i386/ioctlent.h.in"
--- a/linux/arm/ioctlent1.h
+++ b/linux/arm/ioctlent1.h
@ -1,2 +1,2 @@
 /* Our second set comes from the i386 files.  */
-#include "../ioctlent.h"
+#include "linux/ioctlent.h"
--- a/linux/arm/syscallent.h
+++ b/linux/arm/syscallent.h
@ -24,8 +24,6 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id$
 */

 	{ 0,	0,	sys_restart_syscall,	"restart_syscall"}, /* 0 */
@ -52,7 +50,7 @@
 	{ 5,	TF,	sys_mount,		"mount"		}, /* 21 */
 	{ 1,	TF,	sys_umount,		"oldumount"	}, /* 22 */
 	{ 1,	0,	sys_setuid,		"setuid"	}, /* 23 */
-	{ 0,	0,	sys_getuid,		"getuid"	}, /* 24 */
+	{ 0,	NF,	sys_getuid,		"getuid"	}, /* 24 */
 	{ 1,	0,	sys_stime,		"stime"		}, /* 25 */
 	{ 4,	0,	sys_ptrace,		"ptrace"	}, /* 26 */
 	{ 1,	0,	sys_alarm,		"alarm"		}, /* 27 */
@ -75,10 +73,10 @@
 	{ 0,	0,	sys_prof,		"prof"		}, /* 44 */
 	{ 1,	0,	sys_brk,		"brk"		}, /* 45 */
 	{ 1,	0,	sys_setgid,		"setgid"	}, /* 46 */
-	{ 0,	0,	sys_getgid,		"getgid"	}, /* 47 */
+	{ 0,	NF,	sys_getgid,		"getgid"	}, /* 47 */
 	{ 3,	TS,	sys_signal,		"signal"	}, /* 48 */
-	{ 0,	0,	sys_geteuid,		"geteuid"	}, /* 49 */
-	{ 0,	0,	sys_getegid,		"getegid"	}, /* 50 */
+	{ 0,	NF,	sys_geteuid,		"geteuid"	}, /* 49 */
+	{ 0,	NF,	sys_getegid,		"getegid"	}, /* 50 */
 	{ 1,	TF,	sys_acct,		"acct"		}, /* 51 */
 	{ 2,	TF,	sys_umount2,		"umount"	}, /* 52 */
 	{ 0,	0,	sys_lock,		"lock"		}, /* 53 */
@ -96,8 +94,8 @@
 	{ 0,	0,	sys_getpgrp,		"getpgrp"	}, /* 65 */
 	{ 0,	0,	sys_setsid,		"setsid"	}, /* 66 */
 	{ 3,	TS,	sys_sigaction,		"sigaction"	}, /* 67 */
-	{ 0,	TS,	sys_siggetmask,		"siggetmask"	}, /* 68 */
-	{ 1,	TS,	sys_sigsetmask,		"sigsetmask"	}, /* 69 */
+	{ 0,	TS,	sys_siggetmask,		"sgetmask"	}, /* 68 */
+	{ 1,	TS,	sys_sigsetmask,		"ssetmask"	}, /* 69 */
 	{ 2,	0,	sys_setreuid,		"setreuid"	}, /* 70 */
 	{ 2,	0,	sys_setregid,		"setregid"	}, /* 71 */
 	{ 3,	TS,	sys_sigsuspend,		"sigsuspend"	}, /* 72 */
@ -115,10 +113,10 @@
 	{ 2,	TF,	sys_oldlstat,		"oldlstat"	}, /* 84 */
 	{ 3,	TF,	sys_readlink,		"readlink"	}, /* 85 */
 	{ 1,	TF,	sys_uselib,		"uselib"	}, /* 86 */
-	{ 1,	TF,	sys_swapon,		"swapon"	}, /* 87 */
-	{ 3,	0,	sys_reboot,		"reboot"	}, /* 88 */
+	{ 2,	TF,	sys_swapon,		"swapon"	}, /* 87 */
+	{ 4,	0,	sys_reboot,		"reboot"	}, /* 88 */
 	{ 3,	0,	sys_readdir,		"readdir"	}, /* 89 */
-	{ 6,	0,	sys_old_mmap,		"old_mmap"	}, /* 90 */
+	{ 6,	TD,	sys_old_mmap,		"old_mmap"	}, /* 90 */
 	{ 2,	0,	sys_munmap,		"munmap"	}, /* 91 */
 	{ 2,	TF,	sys_truncate,		"truncate"	}, /* 92 */
 	{ 2,	0,	sys_ftruncate,		"ftruncate"	}, /* 93 */
@ -143,11 +141,11 @@
 	{ 0,	0,	sys_idle,		"idle"		}, /* 112 */
 	{ 5,	0,	printargs,		"syscall"	}, /* 113 */
 	{ 4,	TP,	sys_wait4,		"wait4"		}, /* 114 */
-	{ 1,	0,	sys_swapoff,		"swapoff"	}, /* 115 */
+	{ 1,	TF,	sys_swapoff,		"swapoff"	}, /* 115 */
 	{ 1,	0,	sys_sysinfo,		"sysinfo"	}, /* 116 */
-	{ 6,	0,	sys_ipc,		"ipc"		}, /* 117 */
+	{ 6,	TI,	sys_ipc,		"ipc"		}, /* 117 */
 	{ 1,	0,	sys_fsync,		"fsync"		}, /* 118 */
-	{ 1,	TS,	sys_sigreturn,		"sigreturn"	}, /* 119 */
+	{ 0,	TS,	sys_sigreturn,		"sigreturn"	}, /* 119 */
 	{ 5,	TP,	sys_clone,		"clone"		}, /* 120 */
 	{ 2,	0,	sys_setdomainname,	"setdomainname"	}, /* 121 */
 	{ 1,	0,	sys_uname,		"uname"		}, /* 122 */
@ -166,8 +164,8 @@
 	{ 3,	0,	sys_sysfs,		"sysfs"		}, /* 135 */
 	{ 1,	0,	sys_personality,	"personality"	}, /* 136 */
 	{ 5,	0,	sys_afs_syscall,	"afs_syscall"	}, /* 137 */
-	{ 1,	0,	sys_setfsuid,		"setfsuid"	}, /* 138 */
-	{ 1,	0,	sys_setfsgid,		"setfsgid"	}, /* 139 */
+	{ 1,	NF,	sys_setfsuid,		"setfsuid"	}, /* 138 */
+	{ 1,	NF,	sys_setfsgid,		"setfsgid"	}, /* 139 */
 	{ 5,	0,	sys_llseek,		"_llseek"	}, /* 140 */
 	{ 3,	0,	sys_getdents,		"getdents"	}, /* 141 */
 	{ 5,	0,	sys_select,		"select"	}, /* 142 */
@ -180,7 +178,7 @@
 	{ 1,	0,	sys_sysctl,		"_sysctl"	}, /* 149 */
 	{ 2,	0,	sys_mlock,		"mlock"		}, /* 150 */
 	{ 2,	0,	sys_munlock,		"munlock"	}, /* 151 */
-	{ 2,	0,	sys_mlockall,		"mlockall"	}, /* 152 */
+	{ 1,	0,	sys_mlockall,		"mlockall"	}, /* 152 */
 	{ 0,	0,	sys_munlockall,		"munlockall"	}, /* 153 */
 	{ 0,	0,	sys_sched_setparam,	"sched_setparam"}, /* 154 */
 	{ 2,	0,	sys_sched_getparam,	"sched_getparam"}, /* 155 */
@ -191,26 +189,26 @@
 	{ 1,	0,	sys_sched_get_priority_min,"sched_get_priority_min"}, /* 160 */
 	{ 2,	0,	sys_sched_rr_get_interval,"sched_rr_get_interval"}, /* 161 */
 	{ 2,	0,	sys_nanosleep,		"nanosleep"	}, /* 162 */
-	{ 4,	0,	sys_mremap,		"mremap"	}, /* 163 */
+	{ 5,	0,	sys_mremap,		"mremap"	}, /* 163 */
 	{ 3,	0,	sys_setresuid,		"setresuid"	}, /* 164 */
 	{ 3,	0,	sys_getresuid,		"getresuid"	}, /* 165 */
-	{ 5,	0,	printargs,		"vm86"		}, /* 166 */
+	{ 5,	0,	sys_vm86,		"vm86"		}, /* 166 */
 	{ 5,	0,	sys_query_module,	"query_module"	}, /* 167 */
 	{ 3,	0,	sys_poll,		"poll"		}, /* 168 */
-	{ 3,	0,	printargs,		"nfsservctl"	}, /* 169 */
+	{ 3,	0,	sys_nfsservctl,		"nfsservctl"	}, /* 169 */
 	{ 3,	0,	sys_setresgid,		"setresgid"	}, /* 170 */
 	{ 3,	0,	sys_getresgid,		"getresgid"	}, /* 171 */
 	{ 5,	0,	sys_prctl,		"prctl"		}, /* 172 */
-	{ 1,	TS,	printargs,		"rt_sigreturn"	}, /* 173 */
-	{ 4,	TS,	sys_rt_sigaction,	"rt_sigaction"  }, /* 174 */
+	{ 0,	TS,	sys_rt_sigreturn,	"rt_sigreturn"	}, /* 173 */
+	{ 4,	TS,	sys_rt_sigaction,	"rt_sigaction"	}, /* 174 */
 	{ 4,	TS,	sys_rt_sigprocmask,	"rt_sigprocmask"}, /* 175 */
 	{ 2,	TS,	sys_rt_sigpending,	"rt_sigpending"	}, /* 176 */
 	{ 4,	TS,	sys_rt_sigtimedwait,	"rt_sigtimedwait"}, /* 177 */
 	{ 3,	TS,	sys_rt_sigqueueinfo,    "rt_sigqueueinfo"}, /* 178 */
 	{ 2,	TS,	sys_rt_sigsuspend,	"rt_sigsuspend"	}, /* 179 */

-	{ 5,	TF,	sys_pread,		"pread"		}, /* 180 */
-	{ 5,	TF,	sys_pwrite,		"pwrite"	}, /* 181 */
+	{ 6,	TF,	sys_pread,		"pread"		}, /* 180 */
+	{ 6,	TF,	sys_pwrite,		"pwrite"	}, /* 181 */
 	{ 3,	TF,	sys_chown,		"chown"		}, /* 182 */
 	{ 2,	TF,	sys_getcwd,		"getcwd"	}, /* 183 */
 	{ 2,	0,	sys_capget,		"capget"	}, /* 184 */
@ -221,18 +219,18 @@
 	{ 5,	0,	sys_putpmsg,		"putpmsg"	}, /* 189 */
 	{ 0,	TP,	sys_vfork,		"vfork"		}, /* 190 */
 	{ 2,	0,	sys_getrlimit,		"getrlimit"	}, /* 191 */
-	{ 6,	0,	sys_mmap,		"mmap2"		}, /* 192 */
-	{ 3,	TF,	sys_truncate64,		"truncate64"	}, /* 193 */
-	{ 3,	TF,	sys_ftruncate64,	"ftruncate64"	}, /* 194 */
+	{ 6,	TD,	sys_mmap,		"mmap2"		}, /* 192 */
+	{ 4,	TF,	sys_truncate64,		"truncate64"	}, /* 193 */
+	{ 4,	TF,	sys_ftruncate64,	"ftruncate64"	}, /* 194 */
 	{ 2,	TF,	sys_stat64,		"stat64"	}, /* 195 */
 	{ 2,	TF,	sys_lstat64,		"lstat64"	}, /* 196 */
 	{ 2,	TF,	sys_fstat64,		"fstat64"	}, /* 197 */
 	{ 3,	TF,	sys_chown,		"lchown32"	}, /* 198 */
-	{ 0,	0,	sys_getuid,		"getuid32"	}, /* 199 */
+	{ 0,	NF,	sys_getuid,		"getuid32"	}, /* 199 */

-	{ 0,	0,	sys_getgid,		"getgid32"	}, /* 200 */
-	{ 0,	0,	sys_geteuid,		"geteuid32"	}, /* 201 */
-	{ 0,	0,	sys_geteuid,		"getegid32"	}, /* 202 */
+	{ 0,	NF,	sys_getgid,		"getgid32"	}, /* 200 */
+	{ 0,	NF,	sys_geteuid,		"geteuid32"	}, /* 201 */
+	{ 0,	NF,	sys_geteuid,		"getegid32"	}, /* 202 */
 	{ 2,	0,	sys_setreuid,		"setreuid32"	}, /* 203 */
 	{ 2,	0,	sys_setregid,		"setregid32"	}, /* 204 */
 	{ 2,	0,	sys_getgroups32,	"getgroups32"	}, /* 205 */
@ -245,48 +243,48 @@
 	{ 3,	TF,	sys_chown,		"chown32"	}, /* 212 */
 	{ 1,	0,	sys_setuid,		"setuid32"	}, /* 213 */
 	{ 1,	0,	sys_setgid,		"setgid32"	}, /* 214 */
-	{ 1,	0,	sys_setfsuid,		"setfsuid32"	}, /* 215 */
-	{ 1,	0,	sys_setfsgid,		"setfsgid32"	}, /* 216 */
-	{ 3,    0,      sys_getdents64,         "getdents64"    }, /* 217 */
+	{ 1,	NF,	sys_setfsuid,		"setfsuid32"	}, /* 215 */
+	{ 1,	NF,	sys_setfsgid,		"setfsgid32"	}, /* 216 */
+	{ 3,	0,	sys_getdents64,		"getdents64"	}, /* 217 */
 	{ 2,	TF,	sys_pivotroot,		"pivot_root"	}, /* 218 */
-	{ 3,	0,	printargs,		"mincore"	}, /* 219 */
+	{ 3,	0,	sys_mincore,		"mincore"	}, /* 219 */
 	{ 3,	0,	sys_madvise,		"madvise"	}, /* 220 */
 	{ 3,	0,	sys_fcntl,		"fcntl64"	}, /* 221 */
-	{ 5,	0,	printargs,		"SYS_222"	}, /* 222 */
-	{ 5,	0,	printargs,		"SYS_223"	}, /* 223 */
-	{ 0,	0,	printargs,		"gettid"	}, /* 224 */
-	{ 4,	0,	sys_readahead,		"readahead"	}, /* 225 */
+	{ 5,	0,	NULL,			NULL		}, /* 222 */
+	{ 5,	0,	NULL,			NULL		}, /* 223 */
+	{ 0,	0,	sys_gettid,		"gettid"	}, /* 224 */
+	{ 5,	0,	sys_readahead,		"readahead"	}, /* 225 */
 	{ 5,	TF,	sys_setxattr,		"setxattr"	}, /* 226 */
 	{ 5,	TF,	sys_setxattr,		"lsetxattr"	}, /* 227 */
 	{ 5,	0,	sys_fsetxattr,		"fsetxattr"	}, /* 228 */
 	{ 4,	TF,	sys_getxattr,		"getxattr"	}, /* 229 */
 	{ 4,	TF,	sys_getxattr,		"lgetxattr"	}, /* 230 */
-	{ 4,	0,	sys_fgetxattr,		"fgetxattr"	}, /* 231 */
+	{ 4,	TD,	sys_fgetxattr,		"fgetxattr"	}, /* 231 */
 	{ 3,	TF,	sys_listxattr,		"listxattr"	}, /* 232 */
 	{ 3,	TF,	sys_listxattr,		"llistxattr"	}, /* 233 */
-	{ 3,	0,	sys_flistxattr,		"flistxattr"	}, /* 234 */
+	{ 3,	TD,	sys_flistxattr,		"flistxattr"	}, /* 234 */
 	{ 2,	TF,	sys_removexattr,	"removexattr"	}, /* 235 */
 	{ 2,	TF,	sys_removexattr,	"lremovexattr"	}, /* 236 */
-	{ 2,	0,	sys_fremovexattr,	"fremovexattr"	}, /* 237 */
+	{ 2,	TD,	sys_fremovexattr,	"fremovexattr"	}, /* 237 */
 	{ 2,	TS,	sys_kill,		"tkill"		}, /* 238 */
 	{ 4,	TD|TN,	sys_sendfile64,		"sendfile64"	}, /* 239 */
 	{ 6,	0,	sys_futex,		"futex"		}, /* 240 */
 	{ 3,	0,	sys_sched_setaffinity,	"sched_setaffinity" },/* 241 */
 	{ 3,	0,	sys_sched_getaffinity,	"sched_getaffinity" },/* 242 */
-	{ 2,	0,	printargs,		"io_setup"	}, /* 243 */
-	{ 1,	0,	printargs,		"io_destroy"	}, /* 244 */
-	{ 5,	0,	printargs,		"io_getevents"	}, /* 245 */
-	{ 3,	0,	printargs,		"io_submit"	}, /* 246 */
-	{ 3,	0,	printargs,		"io_cancel"	}, /* 247 */
+	{ 2,	0,	sys_io_setup,		"io_setup"	}, /* 243 */
+	{ 1,	0,	sys_io_destroy,		"io_destroy"	}, /* 244 */
+	{ 5,	0,	sys_io_getevents,	"io_getevents"	}, /* 245 */
+	{ 3,	0,	sys_io_submit,		"io_submit"	}, /* 246 */
+	{ 3,	0,	sys_io_cancel,		"io_cancel"	}, /* 247 */
 	{ 1,	TP,	sys_exit,		"exit_group"	}, /* 248 */
-	{ 4,	0,	printargs,		"lookup_dcookie"}, /* 249 */
-	{ 1,	0,	printargs,		"epoll_create"	}, /* 250 */
-	{ 4,	0,	printargs,		"epoll_ctl"	}, /* 251 */
-	{ 4,	0,	printargs,		"epoll_wait"	}, /* 252 */
+	{ 4,	0,	sys_lookup_dcookie,	"lookup_dcookie"}, /* 249 */
+	{ 1,	TD,	sys_epoll_create,	"epoll_create"	}, /* 250 */
+	{ 4,	TD,	sys_epoll_ctl,		"epoll_ctl"	}, /* 251 */
+	{ 4,	TD,	sys_epoll_wait,		"epoll_wait"	}, /* 252 */
 	{ 5,	0,	sys_remap_file_pages,	"remap_file_pages"}, /* 253 */
-	{ 5,	0,	printargs,		"SYS_254"	}, /* 254 */
-	{ 5,	0,	printargs,		"SYS_255"	}, /* 255 */
-	{ 1,	0,	printargs,		"set_tid_address"}, /* 256 */
+	{ 5,	0,	NULL,			NULL		}, /* 254 */
+	{ 5,	0,	NULL,			NULL		}, /* 255 */
+	{ 1,	0,	sys_set_tid_address,	"set_tid_address"}, /* 256 */
 	{ 3,	0,	sys_timer_create,	"timer_create"	}, /* 257 */
 	{ 4,	0,	sys_timer_settime,	"timer_settime"	}, /* 258 */
 	{ 2,	0,	sys_timer_gettime,	"timer_gettime"	}, /* 259 */
@ -300,7 +298,7 @@
 	{ 3,	0,	sys_fstatfs64,		"fstatfs64"	}, /* 267 */
 	{ 3,	TS,	sys_tgkill,		"tgkill"	}, /* 268 */
 	{ 2,	TF,	sys_utimes,		"utimes"	}, /* 269 */
-	{ 6,	0,	sys_fadvise64_64,	"fadvise64_64"	}, /* 270 */
+	{ 6,	TD,	sys_fadvise64_64,	"fadvise64_64"	}, /* 270 */
 	{ 5,	0,	printargs,		"pciconfig_iobase"	}, /* 271 */
 	{ 5,	0,	printargs,		"pciconfig_read"	}, /* 272 */
 	{ 5,	0,	printargs,		"pciconfig_write"	}, /* 273 */
@ -339,14 +337,14 @@
 	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 306 */
 	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 307 */
 	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 308 */
-	{ 5,	0,	printargs,		"add_key"	}, /* 309 */
-	{ 4,	0,	printargs,		"request_key"	}, /* 310 */
-	{ 5,	0,	printargs,		"keyctl"	}, /* 311 */
+	{ 5,	0,	sys_add_key,		"add_key"	}, /* 309 */
+	{ 4,	0,	sys_request_key,	"request_key"	}, /* 310 */
+	{ 5,	0,	sys_keyctl,		"keyctl"	}, /* 311 */
 	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 312 */
-	{ 5,	0,	printargs,		"vserver"	}, /* 313 */
-	{ 3,	0,	printargs,		"ioprio_set"	}, /* 314 */
-	{ 2,	0,	printargs,		"ioprio_get"	}, /* 315 */
-	{ 0,	TD,	printargs,		"inotify_init"	}, /* 316 */
+	{ 5,	0,	sys_vserver,		"vserver"	}, /* 313 */
+	{ 3,	0,	sys_ioprio_set,		"ioprio_set"	}, /* 314 */
+	{ 2,	0,	sys_ioprio_get,		"ioprio_get"	}, /* 315 */
+	{ 0,	TD,	sys_inotify_init,	"inotify_init"	}, /* 316 */
 	{ 3,	TD,	sys_inotify_add_watch,	"inotify_add_watch" }, /* 317 */
 	{ 2,	TD,	sys_inotify_rm_watch,	"inotify_rm_watch" }, /* 318 */
 	{ 6,	0,	sys_mbind,		"mbind"		}, /* 319 */
@ -357,7 +355,7 @@
 	{ 4,	TD|TF,	sys_mknodat,		"mknodat"	}, /* 324 */
 	{ 5,	TD|TF,	sys_fchownat,		"fchownat"	}, /* 325 */
 	{ 3,	TD|TF,	sys_futimesat,		"futimesat"	}, /* 326 */
-	{ 4,	TD|TD,	sys_newfstatat,		"newfstatat"	}, /* 327 */
+	{ 4,	TD|TF,	sys_newfstatat,		"newfstatat"	}, /* 327 */
 	{ 3,	TD|TF,	sys_unlinkat,		"unlinkat"	}, /* 328 */
 	{ 4,	TD|TF,	sys_renameat,		"renameat"	}, /* 329 */
 	{ 5,	TD|TF,	sys_linkat,		"linkat"	}, /* 330 */
@ -365,77 +363,77 @@
 	{ 4,	TD|TF,	sys_readlinkat,		"readlinkat"	}, /* 332 */
 	{ 3,	TD|TF,	sys_fchmodat,		"fchmodat"	}, /* 333 */
 	{ 3,	TD|TF,	sys_faccessat,		"faccessat"	}, /* 334 */
-	{ 5,	0,	printargs,		"SYS_335"	}, /* 335 */
-	{ 5,	0,	printargs,		"SYS_336"	}, /* 336 */
+	{ 6,	TD,	sys_pselect6,		"pselect6"	}, /* 335 */
+	{ 5,	TD,	sys_ppoll,		"ppoll"		}, /* 336 */
 	{ 1,	TP,	sys_unshare,		"unshare"	}, /* 337 */
-	{ 2,	0,	printargs,		"set_robust_list" }, /* 338 */
-	{ 3,	0,	printargs,		"get_robust_list" }, /* 339 */
-	{ 6,	TD,	printargs,		"splice"	}, /* 340 */
-	{ 5,	0,	printargs,		"SYS_341"	}, /* 341 */
-	{ 4,	TD,	printargs,		"tee"		}, /* 342 */
-	{ 4,	TD,	printargs,		"vmsplice"	}, /* 343 */
+	{ 2,	0,	sys_set_robust_list,	"set_robust_list" }, /* 338 */
+	{ 3,	0,	sys_get_robust_list,	"get_robust_list" }, /* 339 */
+	{ 6,	TD,	sys_splice,		"splice"	}, /* 340 */
+	{ 5,	0,	NULL,			NULL		}, /* 341 */
+	{ 4,	TD,	sys_tee,		"tee"		}, /* 342 */
+	{ 4,	TD,	sys_vmsplice,		"vmsplice"	}, /* 343 */
 	{ 6,	0,	sys_move_pages,		"move_pages"	}, /* 344 */
 	{ 3,	0,	sys_getcpu,		"getcpu"	}, /* 345 */
-	{ 5,	0,	printargs,		"SYS_346"	}, /* 346 */
-	{ 5,	0,	printargs,		"kexec_load"	}, /* 347 */
+	{ 6,	TD,	sys_epoll_pwait,	"epoll_pwait"	}, /* 346 */
+	{ 4,	0,	sys_kexec_load,		"kexec_load"	}, /* 347 */
 	{ 4,	TD|TF,	sys_utimensat,		"utimensat"	}, /* 348 */
 	{ 3,	TD|TS,	sys_signalfd,		"signalfd"	}, /* 349 */
 	{ 4,	TD,	sys_timerfd,		"timerfd"	}, /* 350 */
 	{ 1,	TD,	sys_eventfd,		"eventfd"	}, /* 351 */
-	{ 6,	TF,	sys_fallocate,		"fallocate"	}, /* 352 */
+	{ 6,	TD,	sys_fallocate,		"fallocate"	}, /* 352 */
 	{ 4,	TD,	sys_timerfd_settime,	"timerfd_settime"}, /* 353 */
 	{ 2,	TD,	sys_timerfd_gettime,	"timerfd_gettime"}, /* 354 */
-	{ 5,	0,	printargs,		"SYS_355"	}, /* 355 */
-	{ 5,	0,	printargs,		"SYS_356"	}, /* 356 */
-	{ 5,	0,	printargs,		"SYS_357"	}, /* 357 */
-	{ 5,	0,	printargs,		"SYS_358"	}, /* 358 */
-	{ 5,	0,	printargs,		"SYS_359"	}, /* 359 */
-	{ 5,	0,	printargs,		"SYS_360"	}, /* 360 */
-	{ 5,	0,	printargs,		"SYS_361"	}, /* 361 */
-	{ 5,	0,	printargs,		"SYS_362"	}, /* 362 */
-	{ 5,	0,	printargs,		"SYS_363"	}, /* 363 */
-	{ 5,	0,	printargs,		"SYS_364"	}, /* 364 */
-	{ 5,	0,	printargs,		"SYS_365"	}, /* 365 */
-	{ 5,	0,	printargs,		"SYS_366"	}, /* 366 */
-	{ 5,	0,	printargs,		"SYS_367"	}, /* 367 */
-	{ 5,	0,	printargs,		"SYS_368"	}, /* 368 */
-	{ 5,	0,	printargs,		"SYS_369"	}, /* 369 */
-	{ 5,	0,	printargs,		"SYS_370"	}, /* 370 */
-	{ 5,	0,	printargs,		"SYS_371"	}, /* 371 */
-	{ 5,	0,	printargs,		"SYS_372"	}, /* 372 */
-	{ 5,	0,	printargs,		"SYS_373"	}, /* 373 */
-	{ 5,	0,	printargs,		"SYS_374"	}, /* 374 */
-	{ 5,	0,	printargs,		"SYS_375"	}, /* 375 */
-	{ 5,	0,	printargs,		"SYS_376"	}, /* 376 */
-	{ 5,	0,	printargs,		"SYS_377"	}, /* 377 */
-	{ 5,	0,	printargs,		"SYS_378"	}, /* 378 */
-	{ 5,	0,	printargs,		"SYS_379"	}, /* 379 */
-	{ 5,	0,	printargs,		"SYS_380"	}, /* 380 */
-	{ 5,	0,	printargs,		"SYS_381"	}, /* 381 */
-	{ 5,	0,	printargs,		"SYS_382"	}, /* 382 */
-	{ 5,	0,	printargs,		"SYS_383"	}, /* 383 */
-	{ 5,	0,	printargs,		"SYS_384"	}, /* 384 */
-	{ 5,	0,	printargs,		"SYS_385"	}, /* 385 */
-	{ 5,	0,	printargs,		"SYS_386"	}, /* 386 */
-	{ 5,	0,	printargs,		"SYS_387"	}, /* 387 */
-	{ 5,	0,	printargs,		"SYS_388"	}, /* 388 */
-	{ 5,	0,	printargs,		"SYS_389"	}, /* 389 */
-	{ 5,	0,	printargs,		"SYS_390"	}, /* 390 */
-	{ 5,	0,	printargs,		"SYS_391"	}, /* 391 */
-	{ 5,	0,	printargs,		"SYS_392"	}, /* 392 */
-	{ 5,	0,	printargs,		"SYS_393"	}, /* 393 */
-	{ 5,	0,	printargs,		"SYS_394"	}, /* 394 */
-	{ 5,	0,	printargs,		"SYS_395"	}, /* 395 */
-	{ 5,	0,	printargs,		"SYS_396"	}, /* 396 */
-	{ 5,	0,	printargs,		"SYS_397"	}, /* 397 */
-	{ 5,	0,	printargs,		"SYS_398"	}, /* 398 */
-	{ 5,	0,	printargs,		"SYS_399"	}, /* 399 */
+	{ 4,	TD|TS,	sys_signalfd4,		"signalfd4"	}, /* 355 */
+	{ 2,	TD,	sys_eventfd2,		"eventfd2"	}, /* 356 */
+	{ 1,	TD,	sys_epoll_create1,	"epoll_create1"	}, /* 357 */
+	{ 3,	TD,	sys_dup3,		"dup3"		}, /* 358 */
+	{ 2,	TD,	sys_pipe2,		"pipe2"		}, /* 359 */
+	{ 1,	TD,	sys_inotify_init1,	"inotify_init1"	}, /* 360 */
+	{ 6,	TD,	sys_preadv,		"preadv"	}, /* 361 */
+	{ 6,	TD,	sys_pwritev,		"pwritev"	}, /* 362 */
+	{ 4,	TP|TS,	sys_rt_tgsigqueueinfo,	"rt_tgsigqueueinfo"}, /* 363 */
+	{ 5,	TD,	sys_perf_event_open,	"perf_event_open"}, /* 364 */
+	{ 5,	TN,	sys_recvmmsg,		"recvmmsg"	}, /* 365 */
+	{ 4,	TN,	sys_accept4,		"accept4"	}, /* 366 */
+	{ 2,	TD,	sys_fanotify_init,	"fanotify_init"	}, /* 367 */
+	{ 5,	TD|TF,	sys_fanotify_mark,	"fanotify_mark"	}, /* 368 */
+	{ 4,	0,	sys_prlimit64,		"prlimit64"	}, /* 369 */
+	{ 5,	TD|TF,	sys_name_to_handle_at,	"name_to_handle_at"}, /* 370 */
+	{ 3,	TD,	sys_open_by_handle_at,	"open_by_handle_at"}, /* 371 */
+	{ 2,	0,	sys_clock_adjtime,	"clock_adjtime"	}, /* 372 */
+	{ 1,	TD,	sys_syncfs,		"syncfs"	}, /* 373 */
+	{ 4,	TN,	sys_sendmmsg,		"sendmmsg"	}, /* 374 */
+	{ 2,	TD,	sys_setns,		"setns"		}, /* 375 */
+	{ 6,	0,	sys_process_vm_readv,	"process_vm_readv"	}, /* 376 */
+	{ 6,	0,	sys_process_vm_writev,	"process_vm_writev"	}, /* 377 */
+	{ 5,	0,	NULL,			NULL		}, /* 378 */
+	{ 5,	0,	NULL,			NULL		}, /* 379 */
+	{ 5,	0,	NULL,			NULL		}, /* 380 */
+	{ 5,	0,	NULL,			NULL		}, /* 381 */
+	{ 5,	0,	NULL,			NULL		}, /* 382 */
+	{ 5,	0,	NULL,			NULL		}, /* 383 */
+	{ 5,	0,	NULL,			NULL		}, /* 384 */
+	{ 5,	0,	NULL,			NULL		}, /* 385 */
+	{ 5,	0,	NULL,			NULL		}, /* 386 */
+	{ 5,	0,	NULL,			NULL		}, /* 387 */
+	{ 5,	0,	NULL,			NULL		}, /* 388 */
+	{ 5,	0,	NULL,			NULL		}, /* 389 */
+	{ 5,	0,	NULL,			NULL		}, /* 390 */
+	{ 5,	0,	NULL,			NULL		}, /* 391 */
+	{ 5,	0,	NULL,			NULL		}, /* 392 */
+	{ 5,	0,	NULL,			NULL		}, /* 393 */
+	{ 5,	0,	NULL,			NULL		}, /* 394 */
+	{ 5,	0,	NULL,			NULL		}, /* 395 */
+	{ 5,	0,	NULL,			NULL		}, /* 396 */
+	{ 5,	0,	NULL,			NULL		}, /* 397 */
+	{ 5,	0,	NULL,			NULL		}, /* 398 */
+	{ 5,	0,	NULL,			NULL		}, /* 399 */

 #ifndef __ARM_EABI__
 #if SYS_socket_subcall != 400
 #error fix me
 #endif
-	{ 8,	0,	printargs,		"socket_subcall"}, /* 400 */
+	{ 6,	0,	printargs,		"socket_subcall"}, /* 400 */
 	{ 3,	TN,	sys_socket,		"socket"	}, /* 401 */
 	{ 3,	TN,	sys_bind,		"bind"		}, /* 402 */
 	{ 3,	TN,	sys_connect,		"connect"	}, /* 403 */
@ -451,36 +449,37 @@
 	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 413 */
 	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 414 */
 	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 415 */
-	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 416 */
+	{ 3,	TN,	sys_sendmsg,		"sendmsg"	}, /* 416 */
 	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 417 */
 	{ 4,	TN,	sys_accept4,		"accept4"	}, /* 418 */
+	{ 5,	TN,	sys_recvmmsg,		"recvmmsg"	}, /* 419 */

-#if SYS_ipc_subcall != 419
+#if SYS_ipc_subcall != 420
 #error fix me
 #endif
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 419 */
-	{ 4,	TI,	sys_semop,		"semop"		}, /* 420 */
-	{ 4,	TI,	sys_semget,		"semget"	}, /* 421 */
-	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 422 */
-	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 423 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 424 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 420 */
+	{ 4,	TI,	sys_semop,		"semop"		}, /* 421 */
+	{ 4,	TI,	sys_semget,		"semget"	}, /* 422 */
+	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 423 */
+	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 424 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 425 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 426 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 427 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 428 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 429 */
-	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 430 */
-	{ 4,	TI,	sys_msgrcv,		"msgrcv"	}, /* 431 */
-	{ 4,	TI,	sys_msgget,		"msgget"	}, /* 432 */
-	{ 4,	TI,	sys_msgctl,		"msgctl"	}, /* 433 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 434 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 430 */
+	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 431 */
+	{ 4,	TI,	sys_msgrcv,		"msgrcv"	}, /* 432 */
+	{ 4,	TI,	sys_msgget,		"msgget"	}, /* 433 */
+	{ 4,	TI,	sys_msgctl,		"msgctl"	}, /* 434 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 435 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 436 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 437 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 438 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 439 */
-	{ 4,	TI,	sys_shmat,		"shmat"		}, /* 440 */
-	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 441 */
-	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 442 */
-	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 443 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 440 */
+	{ 4,	TI,	sys_shmat,		"shmat"		}, /* 441 */
+	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 442 */
+	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 443 */
+	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 444 */
 #endif
--- a/linux/arm/syscallent1.h
+++ b/linux/arm/syscallent1.h
@ -1,5 +1,5 @@
 /* ARM specific syscalls */
-	{ 5,	0,	printargs,		"SYS_0"			}, /* 0 */
+	{ 5,	0,	NULL,			NULL				}, /* 0 */
 	{ 5,	0,	printargs,		"breakpoint"		}, /* 1 */
 	{ 5,	0,	printargs,		"cacheflush"		}, /* 2 */
 	{ 5,	0,	printargs,		"usr26"			}, /* 3 */
--- a/linux/avr32/ioctlent.h.in
+++ b/linux/avr32/ioctlent.h.in
@ -0,0 +1 @@
+#include "../i386/ioctlent.h.in"
--- a/linux/avr32/syscallent.h
+++ b/linux/avr32/syscallent.h
@ -23,8 +23,6 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id$
 */

 	{ 0,	0,	sys_setup,		"setup"		}, /* 0 */
@ -51,7 +49,7 @@
 	{ 5,	TF,	sys_mount,		"mount"		}, /* 21 */
 	{ 2,	TF,	sys_umount,		"umount"	}, /* 22 */
 	{ 1,	0,	sys_setuid,		"setuid"	}, /* 23 */
-	{ 0,	0,	sys_getuid,		"getuid"	}, /* 24 */
+	{ 0,	NF,	sys_getuid,		"getuid"	}, /* 24 */
 	{ 1,	0,	sys_stime,		"stime"		}, /* 25 */
 	{ 4,	0,	sys_ptrace,		"ptrace"	}, /* 26 */
 	{ 1,	0,	sys_alarm,		"alarm"		}, /* 27 */
@ -74,17 +72,17 @@
 	{ 5,	TP,	sys_clone,		"clone"		}, /* 44 */
 	{ 1,	0,	sys_brk,		"brk"		}, /* 45 */
 	{ 1,	0,	sys_setgid,		"setgid"	}, /* 46 */
-	{ 0,	0,	sys_getgid,		"getgid"	}, /* 47 */
+	{ 0,	NF,	sys_getgid,		"getgid"	}, /* 47 */
 	{ 2,	TF,	sys_getcwd,		"getcwd"	}, /* 48 */
-	{ 0,	0,	sys_geteuid,		"geteuid"	}, /* 49 */
-	{ 0,	0,	sys_getegid,		"getegid"	}, /* 50 */
+	{ 0,	NF,	sys_geteuid,		"geteuid"	}, /* 49 */
+	{ 0,	NF,	sys_getegid,		"getegid"	}, /* 50 */
 	{ 1,	TF,	sys_acct,		"acct"		}, /* 51 */
-	{ 1,	0,	sys_setfsuid,		"setfsuid"	}, /* 52 */
-	{ 1,	0,	sys_setfsgid,		"setfsgid"	}, /* 53 */
+	{ 1,	NF,	sys_setfsuid,		"setfsuid"	}, /* 52 */
+	{ 1,	NF,	sys_setfsgid,		"setfsgid"	}, /* 53 */
 	{ 3,	TD,	sys_ioctl,		"ioctl"		}, /* 54 */
 	{ 3,	TD,	sys_fcntl,		"fcntl"		}, /* 55 */
 	{ 2,	0,	sys_setpgid,		"setpgid"	}, /* 56 */
-	{ 4,	0,	sys_mremap,		"mremap"	}, /* 57 */
+	{ 5,	0,	sys_mremap,		"mremap"	}, /* 57 */
 	{ 3,	0,	sys_setresuid,		"setresuid"	}, /* 58 */
 	{ 3,	0,	sys_getresuid,		"getresuid"	}, /* 59 */
 	{ 2,	0,	sys_setreuid,		"setreuid"	}, /* 60 */
@ -94,8 +92,8 @@
 	{ 0,	0,	sys_getppid,		"getppid"	}, /* 64 */
 	{ 0,	0,	sys_getpgrp,		"getpgrp"	}, /* 65 */
 	{ 0,	0,	sys_setsid,		"setsid"	}, /* 66 */
-	{ 4,	TS,	sys_rt_sigaction,	"rt_sigaction"  }, /* 67 */
-	{ 1,	TS,	printargs,		"rt_sigreturn"	}, /* 68 */
+	{ 4,	TS,	sys_rt_sigaction,	"rt_sigaction"	}, /* 67 */
+	{ 0,	TS,	sys_rt_sigreturn,	"rt_sigreturn"	}, /* 68 */
 	{ 4,	TS,	sys_rt_sigprocmask,	"rt_sigprocmask"}, /* 69 */
 	{ 2,	TS,	sys_rt_sigpending,	"rt_sigpending"	}, /* 70 */
 	{ 4,	TS,	sys_rt_sigtimedwait,	"rt_sigtimedwait"}, /* 71 */
@ -115,9 +113,9 @@
 	{ 3,	TF,	sys_readlink,		"readlink"	}, /* 85 */
 	{ 5,	TD,	sys_pread,		"pread"		}, /* 86 */
 	{ 5,	TD,	sys_pwrite,		"pwrite"	}, /* 87 */
-	{ 1,	TF,	sys_swapon,		"swapon"	}, /* 88 */
-	{ 3,	0,	sys_reboot,		"reboot"	}, /* 89 */
-	{ 6,	0,	sys_mmap,		"mmap"		}, /* 90 */
+	{ 2,	TF,	sys_swapon,		"swapon"	}, /* 88 */
+	{ 4,	0,	sys_reboot,		"reboot"	}, /* 89 */
+	{ 6,	TD,	sys_mmap,		"mmap"		}, /* 90 */
 	{ 2,	0,	sys_munmap,		"munmap"	}, /* 91 */
 	{ 2,	TF,	sys_truncate,		"truncate"	}, /* 92 */
 	{ 2,	TD,	sys_ftruncate,		"ftruncate"	}, /* 93 */
@ -133,9 +131,9 @@
 	{ 3,	0,	sys_syslog,		"syslog"	}, /* 103 */
 	{ 3,	0,	sys_setitimer,		"setitimer"	}, /* 104 */
 	{ 2,	0,	sys_getitimer,		"getitimer"	}, /* 105 */
-	{ 1,	0,	sys_swapoff,		"swapoff"	}, /* 106 */
+	{ 1,	TF,	sys_swapoff,		"swapoff"	}, /* 106 */
 	{ 1,	0,	sys_sysinfo,		"sysinfo"	}, /* 107 */
-	{ 6,	0,	sys_ipc,		"ipc"		}, /* 108 */
+	{ 6,	TI,	sys_ipc,		"ipc"		}, /* 108 */
 	{ 4,	TD|TN,	sys_sendfile,		"sendfile"	}, /* 109 */
 	{ 2,	0,	sys_setdomainname,	"setdomainname"	}, /* 110 */
 	{ 1,	0,	sys_uname,		"uname"		}, /* 111 */
@ -160,7 +158,7 @@
 	{ 1,	0,	sys_sysctl,		"_sysctl"	}, /* 130 */
 	{ 2,	0,	sys_mlock,		"mlock"		}, /* 131 */
 	{ 2,	0,	sys_munlock,		"munlock"	}, /* 132 */
-	{ 2,	0,	sys_mlockall,		"mlockall"	}, /* 133 */
+	{ 1,	0,	sys_mlockall,		"mlockall"	}, /* 133 */
 	{ 0,	0,	sys_munlockall,		"munlockall"	}, /* 134 */
 	{ 0,	0,	sys_sched_setparam,	"sched_setparam"}, /* 135 */
 	{ 2,	0,	sys_sched_getparam,	"sched_getparam"}, /* 136 */
@ -172,7 +170,7 @@
 	{ 2,	0,	sys_sched_rr_get_interval,"sched_rr_get_interval"}, /* 142 */
 	{ 2,	0,	sys_nanosleep,		"nanosleep"	}, /* 143 */
 	{ 3,	TD,	sys_poll,		"poll"		}, /* 144 */
-	{ 3,	0,	printargs,		"nfsservctl"	}, /* 145 */
+	{ 3,	0,	sys_nfsservctl,		"nfsservctl"	}, /* 145 */
 	{ 3,	0,	sys_setresgid,		"setresgid"	}, /* 146 */
 	{ 3,	0,	sys_getresgid,		"getresgid"	}, /* 147 */
 	{ 5,	0,	sys_prctl,		"prctl"		}, /* 148 */
@ -191,7 +189,7 @@
 	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 161 */
 	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 162 */
 	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 163 */
-	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 164 */
+	{ 3,	TN,	sys_sendmsg,		"sendmsg"	}, /* 164 */
 	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 165 */
 	{ 3,	TF,	sys_truncate64,		"truncate64"	}, /* 166 */
 	{ 3,	TD,	sys_ftruncate64,	"ftruncate64"	}, /* 167 */
@ -199,25 +197,25 @@
 	{ 2,	TF,	sys_lstat64,		"lstat64"	}, /* 169 */
 	{ 2,	TD,	sys_fstat64,		"fstat64"	}, /* 170 */
 	{ 2,	TF,	sys_pivotroot,		"pivot_root"	}, /* 171 */
-	{ 3,	0,	printargs,		"mincore"	}, /* 172 */
+	{ 3,	0,	sys_mincore,		"mincore"	}, /* 172 */
 	{ 3,	0,	sys_madvise,		"madvise"	}, /* 173 */
 	{ 3,	TD,	sys_getdents64,		"getdents64"	}, /* 174 */
 	{ 3,	TD,	sys_fcntl,		"fcntl64"	}, /* 175 */
-	{ 0,	0,	printargs,		"gettid"	}, /* 176 */
+	{ 0,	0,	sys_gettid,		"gettid"	}, /* 176 */
 	{ 4,	TD,	sys_readahead,		"readahead"	}, /* 177 */
 	{ 5,	TF,	sys_setxattr,		"setxattr"	}, /* 178 */
 	{ 5,	TF,	sys_setxattr,		"lsetxattr"	}, /* 179 */
 	{ 5,	TD,	sys_fsetxattr,		"fsetxattr"	}, /* 180 */
 	{ 4,	TF,	sys_getxattr,		"getxattr"	}, /* 181 */
 	{ 4,	TF,	sys_getxattr,		"lgetxattr"	}, /* 182 */
-	{ 4,	0,	sys_fgetxattr,		"fgetxattr"	}, /* 183 */
+	{ 4,	TD,	sys_fgetxattr,		"fgetxattr"	}, /* 183 */
 	{ 3,	TF,	sys_listxattr,		"listxattr"	}, /* 184 */
 	{ 3,	TF,	sys_listxattr,		"llistxattr"	}, /* 185 */
-	{ 3,	0,	sys_flistxattr,		"flistxattr"	}, /* 186 */
+	{ 3,	TD,	sys_flistxattr,		"flistxattr"	}, /* 186 */
 	{ 2,	TF,	sys_removexattr,	"removexattr"	}, /* 187 */
 	{ 2,	TF,	sys_removexattr,	"lremovexattr"	}, /* 188 */
 	{ 2,	TD,	sys_fremovexattr,	"fremovexattr"	}, /* 189 */
-	{ 2,	0,	sys_kill,		"tkill"		}, /* 190 */
+	{ 2,	TS,	sys_kill,		"tkill"		}, /* 190 */
 	{ 4,	TD|TN,	sys_sendfile64,		"sendfile64"	}, /* 191 */
 	{ 6,	0,	sys_futex,		"futex"		}, /* 192 */
 	{ 3,	0,	sys_sched_setaffinity,	"sched_setaffinity" },/* 193 */
@ -229,14 +227,14 @@
 	{ 5,	0,	sys_io_getevents,	"io_getevents"	}, /* 199 */
 	{ 3,	0,	sys_io_submit,		"io_submit"	}, /* 200 */
 	{ 3,	0,	sys_io_cancel,		"io_cancel"	}, /* 201 */
-	{ 5,	0,	sys_fadvise64,		"fadvise64"	}, /* 202 */
+	{ 5,	TD,	sys_fadvise64,		"fadvise64"	}, /* 202 */
 	{ 1,	TP,	sys_exit,		"exit_group"	}, /* 203 */
-	{ 4,	0,	printargs,		"lookup_dcookie"}, /* 204 */
-	{ 1,	0,	sys_epoll_create,	"epoll_create"	}, /* 205 */
+	{ 4,	0,	sys_lookup_dcookie,	"lookup_dcookie"}, /* 204 */
+	{ 1,	TD,	sys_epoll_create,	"epoll_create"	}, /* 205 */
 	{ 4,	TD,	sys_epoll_ctl,		"epoll_ctl"	}, /* 206 */
 	{ 4,	TD,	sys_epoll_wait,		"epoll_wait"	}, /* 207 */
 	{ 5,	0,	sys_remap_file_pages,	"remap_file_pages"}, /* 208 */
-	{ 1,	0,	printargs,		"set_tid_address"}, /* 209 */
+	{ 1,	0,	sys_set_tid_address,	"set_tid_address"}, /* 209 */
 	{ 3,	0,	sys_timer_create,	"timer_create"	}, /* 210 */
 	{ 4,	0,	sys_timer_settime,	"timer_settime"	}, /* 211 */
 	{ 2,	0,	sys_timer_gettime,	"timer_gettime"	}, /* 212 */
@ -249,25 +247,25 @@
 	{ 3,	TF,	sys_statfs64,		"statfs64"	}, /* 219 */
 	{ 3,	TD,	sys_fstatfs64,		"fstatfs64"	}, /* 220 */
 	{ 3,	TS,	sys_tgkill,		"tgkill"	}, /* 221 */
-	{ 5,	0,	printargs,		"SYS_222"	}, /* 222 */
+	{ 5,	0,	NULL,			NULL		}, /* 222 */
 	{ 2,	TF,	sys_utimes,		"utimes"	}, /* 223 */
-	{ 6,	0,	sys_fadvise64_64,	"fadvise64_64"	}, /* 224 */
+	{ 6,	TD,	sys_fadvise64_64,	"fadvise64_64"	}, /* 224 */
 	{ 3,	0,	printargs,		"cacheflush"	}, /* 225 */
-	{ 5,	0,	printargs,		"vserver"	}, /* 226 */
+	{ 5,	0,	sys_vserver,		"vserver"	}, /* 226 */
 	{ 4,	0,	sys_mq_open,		"mq_open"	}, /* 227 */
 	{ 1,	0,	sys_mq_unlink,		"mq_unlink"	}, /* 228 */
 	{ 5,	0,	sys_mq_timedsend,	"mq_timedsend"	}, /* 229 */
 	{ 5,	0,	sys_mq_timedreceive,	"mq_timedreceive" }, /* 230 */
 	{ 2,	0,	sys_mq_notify,		"mq_notify"	}, /* 231 */
 	{ 3,	0,	sys_mq_getsetattr,	"mq_getsetattr" }, /* 232 */
-	{ 5,	0,	printargs,		"kexec_load"	}, /* 233 */
+	{ 4,	0,	sys_kexec_load,		"kexec_load"	}, /* 233 */
 	{ 5,	TP,	sys_waitid,		"waitid"	}, /* 234 */
-	{ 5,	0,	printargs,		"add_key"	}, /* 235 */
-	{ 4,	0,	printargs,		"request_key"	}, /* 236 */
-	{ 5,	0,	printargs,		"keyctl"	}, /* 237 */
-	{ 3,	0,	printargs,		"ioprio_set"	}, /* 238 */
-	{ 2,	0,	printargs,		"ioprio_get"	}, /* 239 */
-	{ 0,	0,	printargs,		"inotify_init"	}, /* 240 */
+	{ 5,	0,	sys_add_key,		"add_key"	}, /* 235 */
+	{ 4,	0,	sys_request_key,	"request_key"	}, /* 236 */
+	{ 5,	0,	sys_keyctl,		"keyctl"	}, /* 237 */
+	{ 3,	0,	sys_ioprio_set,		"ioprio_set"	}, /* 238 */
+	{ 2,	0,	sys_ioprio_get,		"ioprio_get"	}, /* 239 */
+	{ 0,	0,	sys_inotify_init,	"inotify_init"	}, /* 240 */
 	{ 3,	TD,	sys_inotify_add_watch,	"inotify_add_watch" }, /* 241 */
 	{ 2,	TD,	sys_inotify_rm_watch,	"inotify_rm_watch" }, /* 242 */
 	{ 4,	TD|TF,	sys_openat,		"openat"	}, /* 243 */
@ -286,13 +284,13 @@
 	{ 6,	TD,	sys_pselect6,		"pselect6"	}, /* 256 */
 	{ 5,	TD,	sys_ppoll,		"ppoll"		}, /* 257 */
 	{ 1,	TD,	sys_unshare,		"unshare"	}, /* 258 */
-	{ 2,	0,	printargs,		"set_robust_list" }, /* 259 */
-	{ 3,	0,	printargs,		"get_robust_list" }, /* 260 */
-	{ 6,	TD,	printargs,		"splice"	}, /* 261 */
-	{ 4,	TD,	printargs,		"sync_file_range" }, /* 262 */
-	{ 4,	TD,	printargs,		"tee"		}, /* 263 */
-	{ 4,	TD,	printargs,		"vmsplice"	}, /* 264 */
-	{ 5,	TD,	sys_epoll_pwait,	"epoll_pwait"   }, /* 265 */
+	{ 2,	0,	sys_set_robust_list,	"set_robust_list" }, /* 259 */
+	{ 3,	0,	sys_get_robust_list,	"get_robust_list" }, /* 260 */
+	{ 6,	TD,	sys_splice,		"splice"	}, /* 261 */
+	{ 4,	TD,	sys_sync_file_range,	"sync_file_range" }, /* 262 */
+	{ 4,	TD,	sys_tee,		"tee"		}, /* 263 */
+	{ 4,	TD,	sys_vmsplice,		"vmsplice"	}, /* 264 */
+	{ 6,	TD,	sys_epoll_pwait,	"epoll_pwait"	}, /* 265 */
 	{ 4,	TI,	sys_msgget,		"msgget"	}, /* 266 */
 	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 267 */
 	{ 5,	TI,	sys_msgrcv,		"msgrcv"	}, /* 268 */
@ -309,3 +307,5 @@
 	{ 3,	TD|TS,	sys_signalfd,		"signalfd"	}, /* 279 */
 	{ 2,	TD,	sys_timerfd,		"timerfd_create" }, /* 280 */
 	{ 1,	TD,	sys_eventfd,		"eventfd"	}, /* 281 */
+	{ 5,	0,	NULL,			NULL		}, /* 282 */
+	{ 2,	TD,	sys_setns,		"setns"		}, /* 283 */
--- a/linux/bfin/ioctlent.h.in
+++ b/linux/bfin/ioctlent.h.in
@ -0,0 +1,86 @@
+	{"asm/bfin_sport.h",	"SPORT_IOC_CONFIG",	0x5001},
+	{"asm/bfin_sport.h",	"SPORT_IOC_GET_SYSTEMCLOCK",	0x5002},
+	{"asm/bfin_sport.h",	"SPORT_IOC_SET_BAUDRATE",	0x5003},
+	{"asm-generic/ioctls.h",	"TCGETS",	0x5401},
+	{"asm-generic/ioctls.h",	"TCSETS",	0x5402},
+	{"asm-generic/ioctls.h",	"TCSETSW",	0x5403},
+	{"asm-generic/ioctls.h",	"TCSETSF",	0x5404},
+	{"asm-generic/ioctls.h",	"TCGETA",	0x5405},
+	{"asm-generic/ioctls.h",	"TCSETA",	0x5406},
+	{"asm-generic/ioctls.h",	"TCSETAW",	0x5407},
+	{"asm-generic/ioctls.h",	"TCSETAF",	0x5408},
+	{"asm-generic/ioctls.h",	"TCSBRK",	0x5409},
+	{"asm-generic/ioctls.h",	"TCXONC",	0x540a},
+	{"asm-generic/ioctls.h",	"TCFLSH",	0x540b},
+	{"asm-generic/ioctls.h",	"TIOCEXCL",	0x540c},
+	{"asm-generic/ioctls.h",	"TIOCNXCL",	0x540d},
+	{"asm-generic/ioctls.h",	"TIOCSCTTY",	0x540e},
+	{"asm-generic/ioctls.h",	"TIOCGPGRP",	0x540f},
+	{"asm-generic/ioctls.h",	"TIOCSPGRP",	0x5410},
+	{"asm-generic/ioctls.h",	"TIOCOUTQ",	0x5411},
+	{"asm-generic/ioctls.h",	"TIOCSTI",	0x5412},
+	{"asm-generic/ioctls.h",	"TIOCGWINSZ",	0x5413},
+	{"asm-generic/ioctls.h",	"TIOCSWINSZ",	0x5414},
+	{"asm-generic/ioctls.h",	"TIOCMGET",	0x5415},
+	{"asm-generic/ioctls.h",	"TIOCMBIS",	0x5416},
+	{"asm-generic/ioctls.h",	"TIOCMBIC",	0x5417},
+	{"asm-generic/ioctls.h",	"TIOCMSET",	0x5418},
+	{"asm-generic/ioctls.h",	"TIOCGSOFTCAR",	0x5419},
+	{"asm-generic/ioctls.h",	"TIOCSSOFTCAR",	0x541a},
+	{"asm-generic/ioctls.h",	"FIONREAD",	0x541b},
+	{"asm-generic/ioctls.h",	"TIOCLINUX",	0x541c},
+	{"asm-generic/ioctls.h",	"TIOCCONS",	0x541d},
+	{"asm-generic/ioctls.h",	"TIOCGSERIAL",	0x541e},
+	{"asm-generic/ioctls.h",	"TIOCSSERIAL",	0x541f},
+	{"asm-generic/ioctls.h",	"TIOCPKT",	0x5420},
+	{"asm-generic/ioctls.h",	"FIONBIO",	0x5421},
+	{"asm-generic/ioctls.h",	"TIOCNOTTY",	0x5422},
+	{"asm-generic/ioctls.h",	"TIOCSETD",	0x5423},
+	{"asm-generic/ioctls.h",	"TIOCGETD",	0x5424},
+	{"asm-generic/ioctls.h",	"TCSBRKP",	0x5425},
+	{"asm-generic/ioctls.h",	"TIOCTTYGSTRUCT",	0x5426},
+	{"asm-generic/ioctls.h",	"TIOCSBRK",	0x5427},
+	{"asm-generic/ioctls.h",	"TIOCCBRK",	0x5428},
+	{"asm-generic/ioctls.h",	"TIOCGSID",	0x5429},
+	{"asm-generic/ioctls.h",	"TCGETS2",	0x542a},
+	{"asm-generic/ioctls.h",	"TCSETS2",	0x542b},
+	{"asm-generic/ioctls.h",	"TCSETSW2",	0x542c},
+	{"asm-generic/ioctls.h",	"TCSETSF2",	0x542d},
+	{"asm-generic/ioctls.h",	"TIOCGRS485",	0x542e},
+	{"asm-generic/ioctls.h",	"TIOCSRS485",	0x542f},
+	{"asm-generic/ioctls.h",	"TIOCGPTN",	0x5430},
+	{"asm-generic/ioctls.h",	"TIOCSPTLCK",	0x5431},
+	{"asm-generic/ioctls.h",	"TCGETX",	0x5432},
+	{"asm-generic/ioctls.h",	"TCSETX",	0x5433},
+	{"asm-generic/ioctls.h",	"TCSETXF",	0x5434},
+	{"asm-generic/ioctls.h",	"TCSETXW",	0x5435},
+	{"asm-generic/ioctls.h",	"TIOCSIG",	0x5436},
+	{"asm-generic/ioctls.h",	"FIONCLEX",	0x5450},
+	{"asm-generic/ioctls.h",	"FIOCLEX",	0x5451},
+	{"asm-generic/ioctls.h",	"FIOASYNC",	0x5452},
+	{"asm-generic/ioctls.h",	"TIOCSERCONFIG",	0x5453},
+	{"asm-generic/ioctls.h",	"TIOCSERGWILD",	0x5454},
+	{"asm-generic/ioctls.h",	"TIOCSERSWILD",	0x5455},
+	{"asm-generic/ioctls.h",	"TIOCGLCKTRMIOS",	0x5456},
+	{"asm-generic/ioctls.h",	"TIOCSLCKTRMIOS",	0x5457},
+	{"asm-generic/ioctls.h",	"TIOCSERGSTRUCT",	0x5458},
+	{"asm-generic/ioctls.h",	"TIOCSERGETLSR",	0x5459},
+	{"asm-generic/ioctls.h",	"TIOCSERGETMULTI",	0x545a},
+	{"asm-generic/ioctls.h",	"TIOCSERSETMULTI",	0x545b},
+	{"asm-generic/ioctls.h",	"TIOCMIWAIT",	0x545c},
+	{"asm-generic/ioctls.h",	"TIOCGICOUNT",	0x545d},
+	{"asm/ioctls.h",	"FIOQSIZE",	0x545e},
+	{"asm-generic/ioctls.h",	"TIOCGHAYESESP",	0x545e},
+	{"asm-generic/ioctls.h",	"TIOCSHAYESESP",	0x545f},
+	{"asm-generic/ioctls.h",	"FIOQSIZE",	0x5460},
+	{"asm/bfin_simple_timer.h",	"BFIN_SIMPLE_TIMER_SET_PERIOD",	0x7402},
+	{"asm/bfin_simple_timer.h",	"BFIN_SIMPLE_TIMER_START",	0x7406},
+	{"asm/bfin_simple_timer.h",	"BFIN_SIMPLE_TIMER_STOP",	0x7408},
+	{"asm/bfin_simple_timer.h",	"BFIN_SIMPLE_TIMER_READ",	0x740a},
+	{"asm-generic/sockios.h",	"FIOSETOWN",	0x8901},
+	{"asm-generic/sockios.h",	"SIOCSPGRP",	0x8902},
+	{"asm-generic/sockios.h",	"FIOGETOWN",	0x8903},
+	{"asm-generic/sockios.h",	"SIOCGPGRP",	0x8904},
+	{"asm-generic/sockios.h",	"SIOCATMARK",	0x8905},
+	{"asm-generic/sockios.h",	"SIOCGSTAMP",	0x8906},
+	{"asm-generic/sockios.h",	"SIOCGSTAMPNS",	0x8907},
--- a/linux/bfin/syscallent.h
+++ b/linux/bfin/syscallent.h
@ -24,22 +24,20 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id$
 */

 	{ 0,	0,	sys_restart_syscall,	"restart_syscall"	}, /* 0 */
-	{ 1,	TP,	sys_exit,		"_exit", SYS_exit }, /* 1 */
-	{ 0,	TP,	sys_fork,		"fork", SYS_fork }, /* 2 */
-	{ 3,	TD,	sys_read,		"read", SYS_read }, /* 3 */
-	{ 3,	TD,	sys_write,		"write", SYS_write }, /* 4 */
+	{ 1,	TP,	sys_exit,		"_exit"		}, /* 1 */
+	{ 0,	TP,	sys_fork,		"fork"		}, /* 2 */
+	{ 3,	TD,	sys_read,		"read"		}, /* 3 */
+	{ 3,	TD,	sys_write,		"write"		}, /* 4 */
 	{ 3,	TD|TF,	sys_open,		"open"		}, /* 5 */
 	{ 1,	TD,	sys_close,		"close"		}, /* 6 */
-	{ 3,	TP,	sys_waitpid,		"waitpid", SYS_wait4 }, /* 7 */
+	{ 3,	TP,	sys_waitpid,		"waitpid"	}, /* 7 */
 	{ 2,	TD|TF,	sys_creat,		"creat"		}, /* 8 */
 	{ 2,	TF,	sys_link,		"link"		}, /* 9 */
 	{ 1,	TF,	sys_unlink,		"unlink"	}, /* 10 */
-	{ 3,	TF|TP,	sys_execve,		"execve", SYS_execve }, /* 11 */
+	{ 3,	TF|TP,	sys_execve,		"execve"	}, /* 11 */
 	{ 1,	TF,	sys_chdir,		"chdir"		}, /* 12 */
 	{ 1,	0,	sys_time,		"time"		}, /* 13 */
 	{ 3,	TF,	sys_mknod,		"mknod"		}, /* 14 */
@ -52,7 +50,7 @@
 	{ 5,	TF,	sys_mount,		"mount"		}, /* 21 */
 	{ 1,	TF,	sys_umount,		"oldumount"	}, /* 22 */
 	{ 1,	0,	sys_setuid,		"setuid"	}, /* 23 */
-	{ 0,	0,	sys_getuid,		"getuid"	}, /* 24 */
+	{ 0,	NF,	sys_getuid,		"getuid"	}, /* 24 */
 	{ 1,	0,	sys_stime,		"stime"		}, /* 25 */
 	{ 4,	0,	sys_ptrace,		"ptrace"	}, /* 26 */
 	{ 1,	0,	sys_alarm,		"alarm"		}, /* 27 */
@ -75,10 +73,10 @@
 	{ 0,	0,	sys_prof,		"prof"		}, /* 44 */
 	{ 1,	0,	sys_brk,		"brk"		}, /* 45 */
 	{ 1,	0,	sys_setgid,		"setgid"	}, /* 46 */
-	{ 0,	0,	sys_getgid,		"getgid"	}, /* 47 */
+	{ 0,	NF,	sys_getgid,		"getgid"	}, /* 47 */
 	{ 3,	TS,	sys_signal,		"signal"	}, /* 48 */
-	{ 0,	0,	sys_geteuid,		"geteuid"	}, /* 49 */
-	{ 0,	0,	sys_getegid,		"getegid"	}, /* 50 */
+	{ 0,	NF,	sys_geteuid,		"geteuid"	}, /* 49 */
+	{ 0,	NF,	sys_getegid,		"getegid"	}, /* 50 */
 	{ 1,	TF,	sys_acct,		"acct"		}, /* 51 */
 	{ 2,	TF,	sys_umount2,		"umount"	}, /* 52 */
 	{ 0,	0,	sys_lock,		"lock"		}, /* 53 */
@ -96,8 +94,8 @@
 	{ 0,	0,	sys_getpgrp,		"getpgrp"	}, /* 65 */
 	{ 0,	0,	sys_setsid,		"setsid"	}, /* 66 */
 	{ 3,	TS,	sys_sigaction,		"sigaction"	}, /* 67 */
-	{ 0,	TS,	sys_siggetmask,		"siggetmask"	}, /* 68 */
-	{ 1,	TS,	sys_sigsetmask,		"sigsetmask"	}, /* 69 */
+	{ 0,	TS,	sys_siggetmask,		"sgetmask"	}, /* 68 */
+	{ 1,	TS,	sys_sigsetmask,		"ssetmask"	}, /* 69 */
 	{ 2,	0,	sys_setreuid,		"setreuid"	}, /* 70 */
 	{ 2,	0,	sys_setregid,		"setregid"	}, /* 71 */
 	{ 3,	TS,	sys_sigsuspend,		"sigsuspend"	}, /* 72 */
@ -115,8 +113,8 @@
 	{ 2,	TF,	sys_oldlstat,		"oldlstat"	}, /* 84 */
 	{ 3,	TF,	sys_readlink,		"readlink"	}, /* 85 */
 	{ 1,	TF,	sys_uselib,		"uselib"	}, /* 86 */
-	{ 1,	TF,	sys_swapon,		"swapon"	}, /* 87 */
-	{ 3,	0,	sys_reboot,		"reboot"	}, /* 88 */
+	{ 2,	TF,	sys_swapon,		"swapon"	}, /* 87 */
+	{ 4,	0,	sys_reboot,		"reboot"	}, /* 88 */
 	{ 3,	TD,	sys_readdir,		"readdir"	}, /* 89 */
 	{ 6,	TD,	sys_old_mmap,		"old_mmap"	}, /* 90 */
 	{ 2,	0,	sys_munmap,		"munmap"	}, /* 91 */
@ -130,7 +128,7 @@
 	{ 2,	TF,	sys_statfs,		"statfs"	}, /* 99 */
 	{ 2,	TD,	sys_fstatfs,		"fstatfs"	}, /* 100 */
 	{ 3,	0,	sys_ioperm,		"ioperm"	}, /* 101 */
-	{ 2,	TD,	sys_socketcall,		"socketcall", SYS_socketcall }, /* 102 */
+	{ 2,	TD,	sys_socketcall,		"socketcall"	}, /* 102 */
 	{ 3,	0,	sys_syslog,		"syslog"	}, /* 103 */
 	{ 3,	0,	sys_setitimer,		"setitimer"	}, /* 104 */
 	{ 2,	0,	sys_getitimer,		"getitimer"	}, /* 105 */
@ -142,13 +140,13 @@
 	{ 0,	0,	sys_vhangup,		"vhangup"	}, /* 111 */
 	{ 0,	0,	sys_idle,		"idle"		}, /* 112 */
 	{ 1,	0,	sys_vm86old,		"vm86old"	}, /* 113 */
-	{ 4,	TP,	sys_wait4,		"wait4", SYS_wait4 }, /* 114 */
-	{ 1,	0,	sys_swapoff,		"swapoff"	}, /* 115 */
+	{ 4,	TP,	sys_wait4,		"wait4"		}, /* 114 */
+	{ 1,	TF,	sys_swapoff,		"swapoff"	}, /* 115 */
 	{ 1,	0,	sys_sysinfo,		"sysinfo"	}, /* 116 */
-	{ 6,	0,	sys_ipc,		"ipc", SYS_ipc }, /* 117 */
+	{ 6,	TI,	sys_ipc,		"ipc"		}, /* 117 */
 	{ 1,	TD,	sys_fsync,		"fsync"		}, /* 118 */
-	{ 1,	TS,	sys_sigreturn,		"sigreturn"	}, /* 119 */
-	{ 5,	TP,	sys_clone,		"clone", SYS_clone }, /* 120 */
+	{ 0,	TS,	sys_sigreturn,		"sigreturn"	}, /* 119 */
+	{ 5,	TP,	sys_clone,		"clone"		}, /* 120 */
 	{ 2,	0,	sys_setdomainname,	"setdomainname"	}, /* 121 */
 	{ 1,	0,	sys_uname,		"uname"		}, /* 122 */
 	{ 3,	0,	sys_modify_ldt,		"modify_ldt"	}, /* 123 */
@ -163,24 +161,24 @@
 	{ 1,	0,	sys_getpgid,		"getpgid"	}, /* 132 */
 	{ 1,	TD,	sys_fchdir,		"fchdir"	}, /* 133 */
 	{ 0,	0,	sys_bdflush,		"bdflush"	}, /* 134 */
-	{ 3,	0,	printargs,		"sysfs"		}, /* 135 */
+	{ 3,	0,	sys_sysfs,		"sysfs"		}, /* 135 */
 	{ 1,	0,	sys_personality,	"personality"	}, /* 136 */
 	{ 5,	0,	sys_afs_syscall,	"afs_syscall"	}, /* 137 */
-	{ 1,	0,	sys_setfsuid,		"setfsuid"	}, /* 138 */
-	{ 1,	0,	sys_setfsgid,		"setfsgid"	}, /* 139 */
+	{ 1,	NF,	sys_setfsuid,		"setfsuid"	}, /* 138 */
+	{ 1,	NF,	sys_setfsgid,		"setfsgid"	}, /* 139 */
 	{ 5,	TD,	sys_llseek,		"_llseek"	}, /* 140 */
 	{ 3,	TD,	sys_getdents,		"getdents"	}, /* 141 */
 	{ 5,	TD,	sys_select,		"select"	}, /* 142 */
 	{ 2,	TD,	sys_flock,		"flock"		}, /* 143 */
 	{ 3,	0,	sys_msync,		"msync"		}, /* 144 */
-	{ 3,	TD,	sys_readv,		"readv", SYS_readv }, /* 145 */
-	{ 3,	TD,	sys_writev,		"writev", SYS_writev }, /* 146 */
+	{ 3,	TD,	sys_readv,		"readv"		}, /* 145 */
+	{ 3,	TD,	sys_writev,		"writev"	}, /* 146 */
 	{ 1,	0,	sys_getsid,		"getsid"	}, /* 147 */
 	{ 1,	TD,	sys_fdatasync,		"fdatasync"	}, /* 148 */
 	{ 1,	0,	sys_sysctl,		"_sysctl"	}, /* 149 */
 	{ 2,	0,	sys_mlock,		"mlock"		}, /* 150 */
 	{ 2,	0,	sys_munlock,		"munlock"	}, /* 151 */
-	{ 2,	0,	sys_mlockall,		"mlockall"	}, /* 152 */
+	{ 1,	0,	sys_mlockall,		"mlockall"	}, /* 152 */
 	{ 0,	0,	sys_munlockall,		"munlockall"	}, /* 153 */
 	{ 0,	0,	sys_sched_setparam,	"sched_setparam"	}, /* 154 */
 	{ 2,	0,	sys_sched_getparam,	"sched_getparam"	}, /* 155 */
@ -191,25 +189,25 @@
 	{ 1,	0,	sys_sched_get_priority_min,	"sched_get_priority_min"	}, /* 160 */
 	{ 2,	0,	sys_sched_rr_get_interval,	"sched_rr_get_interval"	}, /* 161 */
 	{ 2,	0,	sys_nanosleep,		"nanosleep"	}, /* 162 */
-	{ 4,	0,	sys_mremap,		"mremap"	}, /* 163 */
+	{ 5,	0,	sys_mremap,		"mremap"	}, /* 163 */
 	{ 3,	0,	sys_setresuid,		"setresuid"	}, /* 164 */
 	{ 3,	0,	sys_getresuid,		"getresuid"	}, /* 165 */
-	{ 5,	0,	printargs,		"vm86"		}, /* 166 */
+	{ 5,	0,	sys_vm86,		"vm86"		}, /* 166 */
 	{ 5,	0,	sys_query_module,	"query_module"	}, /* 167 */
 	{ 3,	TD,	sys_poll,		"poll"		}, /* 168 */
-	{ 3,	0,	printargs,		"nfsservctl"	}, /* 169 */
+	{ 3,	0,	sys_nfsservctl,		"nfsservctl"	}, /* 169 */
 	{ 3,	0,	sys_setresgid,		"setresgid"	}, /* 170 */
 	{ 3,	0,	sys_getresgid,		"getresgid"	}, /* 171 */
-	{ 5,	0,	printargs,		"prctl"		}, /* 172 */
-	{ 1,	TS,	printargs,		"rt_sigreturn"	}, /* 173 */
+	{ 5,	0,	sys_prctl,		"prctl"		}, /* 172 */
+	{ 0,	TS,	sys_rt_sigreturn,	"rt_sigreturn"	}, /* 173 */
 	{ 4,	TS,	sys_rt_sigaction,	"rt_sigaction"	}, /* 174 */
 	{ 4,	TS,	sys_rt_sigprocmask,	"rt_sigprocmask"	}, /* 175 */
 	{ 2,	TS,	sys_rt_sigpending,	"rt_sigpending"	}, /* 176 */
 	{ 4,	TS,	sys_rt_sigtimedwait,	"rt_sigtimedwait"	}, /* 177 */
 	{ 3,	TS,	sys_rt_sigqueueinfo,	"rt_sigqueueinfo"	}, /* 178 */
 	{ 2,	TS,	sys_rt_sigsuspend,	"rt_sigsuspend"	}, /* 179 */
-	{ 5,	TD,	sys_pread,		"pread", SYS_read }, /* 180 */
-	{ 5,	TD,	sys_pwrite,		"pwrite", SYS_write }, /* 181 */
+	{ 5,	TD,	sys_pread,		"pread"		}, /* 180 */
+	{ 5,	TD,	sys_pwrite,		"pwrite"	}, /* 181 */
 	{ 3,	TF,	sys_chown,		"lchown"	}, /* 182 */
 	{ 2,	TF,	sys_getcwd,		"getcwd"	}, /* 183 */
 	{ 2,	0,	sys_capget,		"capget"	}, /* 184 */
@ -218,19 +216,19 @@
 	{ 4,	TD|TN,	sys_sendfile,		"sendfile"	}, /* 187 */
 	{ 5,	0,	sys_getpmsg,		"getpmsg"	}, /* 188 */
 	{ 5,	0,	sys_putpmsg,		"putpmsg"	}, /* 189 */
-	{ 0,	TP,	sys_vfork,		"vfork", SYS_vfork }, /* 190 */
+	{ 0,	TP,	sys_vfork,		"vfork"		}, /* 190 */
 	{ 2,	0,	sys_getrlimit,		"getrlimit"	}, /* 191 */
-	{ 6,	0,	sys_mmap,		"mmap2"		}, /* 192 */
+	{ 6,	TD,	sys_mmap,		"mmap2"		}, /* 192 */
 	{ 3,	TF,	sys_truncate64,		"truncate64"	}, /* 193 */
 	{ 3,	TD,	sys_ftruncate64,	"ftruncate64"	}, /* 194 */
 	{ 2,	TF,	sys_stat64,		"stat64"	}, /* 195 */
 	{ 2,	TF,	sys_lstat64,		"lstat64"	}, /* 196 */
 	{ 2,	TD,	sys_fstat64,		"fstat64"	}, /* 197 */
 	{ 3,	TF,	sys_chown,		"chown32"	}, /* 198 */
-	{ 0,	0,	sys_getuid,		"getuid32"	}, /* 199 */
-	{ 0,	0,	sys_getgid,		"getgid32"	}, /* 200 */
-	{ 0,	0,	sys_geteuid,		"geteuid32"	}, /* 201 */
-	{ 0,	0,	sys_geteuid,		"getegid32"	}, /* 202 */
+	{ 0,	NF,	sys_getuid,		"getuid32"	}, /* 199 */
+	{ 0,	NF,	sys_getgid,		"getgid32"	}, /* 200 */
+	{ 0,	NF,	sys_geteuid,		"geteuid32"	}, /* 201 */
+	{ 0,	NF,	sys_geteuid,		"getegid32"	}, /* 202 */
 	{ 2,	0,	sys_setreuid,		"setreuid32"	}, /* 203 */
 	{ 2,	0,	sys_setregid,		"setregid32"	}, /* 204 */
 	{ 2,	0,	sys_getgroups32,	"getgroups32"	}, /* 205 */
@ -243,26 +241,26 @@
 	{ 3,	TF,	sys_chown,		"lchown32"	}, /* 212 */
 	{ 1,	0,	sys_setuid,		"setuid32"	}, /* 213 */
 	{ 1,	0,	sys_setgid,		"setgid32"	}, /* 214 */
-	{ 1,	0,	sys_setfsuid,		"setfsuid32"	}, /* 215 */
-	{ 1,	0,	sys_setfsgid,		"setfsgid32"	}, /* 216 */
+	{ 1,	NF,	sys_setfsuid,		"setfsuid32"	}, /* 215 */
+	{ 1,	NF,	sys_setfsgid,		"setfsgid32"	}, /* 216 */
 	{ 2,	TF,	sys_pivotroot,		"pivot_root"	}, /* 217 */
 	{ 3,	0,	sys_mincore,		"mincore"	}, /* 218 */
 	{ 3,	0,	sys_madvise,		"madvise"	}, /* 219 */
 	{ 3,	TD,	sys_getdents64,		"getdents64"	}, /* 220 */
 	{ 3,	TD,	sys_fcntl,		"fcntl64"	}, /* 221 */
-	{ 4,	0,	printargs,		"SYS_222"	}, /* 222 */
-	{ 5,	0,	printargs,		"security"	}, /* 223 */
-	{ 0,	0,	printargs,		"gettid"	}, /* 224 */
+	{ 4,	0,	NULL,			NULL		}, /* 222 */
+	{ 5,	0,	sys_security,		"security"	}, /* 223 */
+	{ 0,	0,	sys_gettid,		"gettid"	}, /* 224 */
 	{ 4,	TD,	sys_readahead,		"readahead"	}, /* 225 */
 	{ 5,	TF,	sys_setxattr,		"setxattr"	}, /* 226 */
 	{ 5,	TF,	sys_setxattr,		"lsetxattr"	}, /* 227 */
 	{ 5,	TD,	sys_fsetxattr,		"fsetxattr"	}, /* 228 */
 	{ 4,	TF,	sys_getxattr,		"getxattr"	}, /* 229 */
 	{ 4,	TF,	sys_getxattr,		"lgetxattr"	}, /* 230 */
-	{ 4,	0,	sys_fgetxattr,		"fgetxattr"	}, /* 231 */
+	{ 4,	TD,	sys_fgetxattr,		"fgetxattr"	}, /* 231 */
 	{ 3,	TF,	sys_listxattr,		"listxattr"	}, /* 232 */
 	{ 3,	TF,	sys_listxattr,		"llistxattr"	}, /* 233 */
-	{ 3,	0,	sys_flistxattr,		"flistxattr"	}, /* 234 */
+	{ 3,	TD,	sys_flistxattr,		"flistxattr"	}, /* 234 */
 	{ 2,	TF,	sys_removexattr,	"removexattr"	}, /* 235 */
 	{ 2,	TF,	sys_removexattr,	"lremovexattr"	}, /* 236 */
 	{ 2,	TD,	sys_fremovexattr,	"fremovexattr"	}, /* 237 */
@ -280,14 +278,14 @@
 	{ 3,	0,	sys_io_cancel,		"io_cancel"	}, /* 249 */
 	{ 5,	0,	printargs,		"alloc_hugepages"	}, /* 250 */
 	{ 1,	0,	printargs,		"free_hugepages"	}, /* 251 */
-	{ 1,	TP,	sys_exit,		"exit_group", __NR_exit_group }, /* 252 */
-	{ 4,	0,	printargs,		"lookup_dcookie"	}, /* 253 */
+	{ 1,	TP,	sys_exit,		"exit_group"	}, /* 252 */
+	{ 4,	0,	sys_lookup_dcookie,	"lookup_dcookie"	}, /* 253 */
 	{ 1,	0,	printargs,		"bfin_spinlock"	}, /* 254 */
-	{ 1,	0,	sys_epoll_create,	"epoll_create"	}, /* 255 */
+	{ 1,	TD,	sys_epoll_create,	"epoll_create"	}, /* 255 */
 	{ 4,	TD,	sys_epoll_ctl,		"epoll_ctl"	}, /* 256 */
 	{ 4,	TD,	sys_epoll_wait,		"epoll_wait"	}, /* 257 */
 	{ 5,	0,	sys_remap_file_pages,	"remap_file_pages"	}, /* 258 */
-	{ 1,	0,	printargs,		"set_tid_address"	}, /* 259 */
+	{ 1,	0,	sys_set_tid_address,	"set_tid_address"	}, /* 259 */
 	{ 3,	0,	sys_timer_create,	"timer_create"	}, /* 260 */
 	{ 4,	0,	sys_timer_settime,	"timer_settime"	}, /* 261 */
 	{ 2,	0,	sys_timer_gettime,	"timer_gettime"	}, /* 262 */
@ -301,8 +299,8 @@
 	{ 3,	TD,	sys_fstatfs64,		"fstatfs64"	}, /* 270 */
 	{ 3,	TS,	sys_tgkill,		"tgkill"	}, /* 271 */
 	{ 2,	TF,	sys_utimes,		"utimes"	}, /* 272 */
-	{ 6,	0,	sys_fadvise64_64,	"fadvise64_64"	}, /* 273 */
-	{ 5,	0,	printargs,		"vserver"	}, /* 274 */
+	{ 6,	TD,	sys_fadvise64_64,	"fadvise64_64"	}, /* 273 */
+	{ 5,	0,	sys_vserver,		"vserver"	}, /* 274 */
 	{ 6,	0,	sys_mbind,		"mbind"		}, /* 275 */
 	{ 5,	0,	sys_get_mempolicy,	"get_mempolicy"	}, /* 276 */
 	{ 3,	0,	sys_set_mempolicy,	"set_mempolicy"	}, /* 277 */
@ -312,23 +310,23 @@
 	{ 5,	0,	sys_mq_timedreceive,	"mq_timedreceive"	}, /* 281 */
 	{ 2,	0,	sys_mq_notify,		"mq_notify"	}, /* 282 */
 	{ 3,	0,	sys_mq_getsetattr,	"mq_getsetattr"	}, /* 283 */
-	{ 5,	0,	printargs,		"kexec_load"	}, /* 284 */
-	{ 5,	TP,	sys_waitid,		"waitid", SYS_waitid }, /* 285 */
-	{ 5,	0,	printargs,		"add_key"	}, /* 286 */
-	{ 4,	0,	printargs,		"request_key"	}, /* 287 */
-	{ 5,	0,	printargs,		"keyctl"	}, /* 288 */
-	{ 3,	0,	printargs,		"ioprio_set"	}, /* 289 */
-	{ 2,	0,	printargs,		"ioprio_get"	}, /* 290 */
-	{ 0,	TD,	printargs,		"inotify_init"	}, /* 291 */
+	{ 4,	0,	sys_kexec_load,		"kexec_load"	}, /* 284 */
+	{ 5,	TP,	sys_waitid,		"waitid"	}, /* 285 */
+	{ 5,	0,	sys_add_key,		"add_key"	}, /* 286 */
+	{ 4,	0,	sys_request_key,	"request_key"	}, /* 287 */
+	{ 5,	0,	sys_keyctl,		"keyctl"	}, /* 288 */
+	{ 3,	0,	sys_ioprio_set,		"ioprio_set"	}, /* 289 */
+	{ 2,	0,	sys_ioprio_get,		"ioprio_get"	}, /* 290 */
+	{ 0,	TD,	sys_inotify_init,	"inotify_init"	}, /* 291 */
 	{ 3,	TD,	sys_inotify_add_watch,	"inotify_add_watch"	}, /* 292 */
 	{ 2,	TD,	sys_inotify_rm_watch,	"inotify_rm_watch"	}, /* 293 */
-	{ 4,	0,	printargs,		"migrate_pages"	}, /* 294 */
+	{ 4,	0,	sys_migrate_pages,	"migrate_pages"	}, /* 294 */
 	{ 4,	TD|TF,	sys_openat,		"openat"	}, /* 295 */
 	{ 3,	TD|TF,	sys_mkdirat,		"mkdirat"	}, /* 296 */
 	{ 4,	TD|TF,	sys_mknodat,		"mknodat"	}, /* 297 */
 	{ 5,	TD|TF,	sys_fchownat,		"fchownat"	}, /* 298 */
 	{ 3,	TD|TF,	sys_futimesat,		"futimesat"	}, /* 299 */
-	{ 4,	TD|TD,	sys_newfstatat,		"fstatat64"	}, /* 300 */
+	{ 4,	TD|TF,	sys_newfstatat,		"fstatat64"	}, /* 300 */
 	{ 3,	TD|TF,	sys_unlinkat,		"unlinkat"	}, /* 301 */
 	{ 4,	TD|TF,	sys_renameat,		"renameat"	}, /* 302 */
 	{ 5,	TD|TF,	sys_linkat,		"linkat"	}, /* 303 */
@ -349,12 +347,12 @@
 	{ 3,	TN,	sys_getsockname,	"getsockname"	}, /* 318 */
 	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 319 */
 	{ 2,	TN,	sys_listen,		"listen"	}, /* 320 */
-	{ 4,	TN,	sys_recv,		"recv", SYS_sub_recv }, /* 321 */
-	{ 6,	TN,	sys_recvfrom,		"recvfrom", SYS_sub_recvfrom }, /* 322 */
+	{ 4,	TN,	sys_recv,		"recv"		}, /* 321 */
+	{ 6,	TN,	sys_recvfrom,		"recvfrom"	}, /* 322 */
 	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 323 */
-	{ 4,	TN,	sys_send,		"send", SYS_sub_send }, /* 324 */
-	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 325 */
-	{ 6,	TN,	sys_sendto,		"sendto", SYS_sub_sendto }, /* 326 */
+	{ 4,	TN,	sys_send,		"send"		}, /* 324 */
+	{ 3,	TN,	sys_sendmsg,		"sendmsg"	}, /* 325 */
+	{ 6,	TN,	sys_sendto,		"sendto"	}, /* 326 */
 	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 327 */
 	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 328 */
 	{ 3,	TN,	sys_socket,		"socket"	}, /* 329 */
@ -370,31 +368,42 @@
 	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 339 */
 	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 340 */
 	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 341 */
-	{ 6,	TD,	printargs,		"splice"	}, /* 342 */
-	{ 4,	TD,	printargs,		"sync_file_range"	}, /* 343 */
-	{ 4,	TD,	printargs,		"tee"		}, /* 344 */
-	{ 4,	TD,	printargs,		"vmsplice"	}, /* 345 */
-	{ 5,	TD,	sys_epoll_pwait,	"epoll_pwait"	}, /* 346 */
+	{ 6,	TD,	sys_splice,		"splice"	}, /* 342 */
+	{ 4,	TD,	sys_sync_file_range,	"sync_file_range"	}, /* 343 */
+	{ 4,	TD,	sys_tee,		"tee"		}, /* 344 */
+	{ 4,	TD,	sys_vmsplice,		"vmsplice"	}, /* 345 */
+	{ 6,	TD,	sys_epoll_pwait,	"epoll_pwait"	}, /* 346 */
 	{ 4,	TD|TF,	sys_utimensat,		"utimensat"	}, /* 347 */
 	{ 3,	TD|TS,	sys_signalfd,		"signalfd"	}, /* 348 */
 	{ 2,	TD,	sys_timerfd_create,	"timerfd_create"	}, /* 349 */
 	{ 1,	TD,	sys_eventfd,		"eventfd"	}, /* 350 */
 	{ 5,	0,	sys_pread,		"pread64"	}, /* 351 */
 	{ 5,	0,	sys_pwrite,		"pwrite64"	}, /* 352 */
-	{ 5,	0,	sys_fadvise64,		"fadvise64"	}, /* 353 */
-	{ 2,	0,	printargs,		"set_robust_list"	}, /* 354 */
-	{ 3,	0,	printargs,		"get_robust_list"	}, /* 355 */
-	{ 4,	0,	printargs,		"fallocate"	}, /* 356 */
+	{ 5,	TD,	sys_fadvise64,		"fadvise64"	}, /* 353 */
+	{ 2,	0,	sys_set_robust_list,	"set_robust_list"	}, /* 354 */
+	{ 3,	0,	sys_get_robust_list,	"get_robust_list"	}, /* 355 */
+	{ 6,	TD,	sys_fallocate,		"fallocate"	}, /* 356 */
 	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 357 */
 	{ 4,	TD,	sys_timerfd_settime,	"timerfd_settime"	}, /* 358 */
 	{ 2,	TD,	sys_timerfd_gettime,	"timerfd_gettime"	}, /* 359 */
-	{ 4,	TD|TS,	printargs,		"signalfd4"	}, /* 360 */
-	{ 2,	TD,	printargs,		"eventfd2"	}, /* 361 */
-	{ 1,	0,	printargs,		"epoll_create1"	}, /* 362 */
-	{ 3,	TD,	printargs,		"dup3"		}, /* 363 */
-	{ 2,	TD,	printargs,		"pipe2"		}, /* 364 */
-	{ 1,	TD,	printargs,		"inotify_init1"	}, /* 365 */
-	{ 5,	TD,	printargs,		"preadv"	}, /* 366 */
-	{ 5,	TD,	printargs,		"pwritev"	}, /* 367 */
-	{ 4,	TP|TS,	printargs,		"rt_tgsigqueueinfo"	}, /* 368 */
-	{ 5,	0,	printargs,		"perf_counter_open"	}, /* 369 */
+	{ 4,	TD|TS,	sys_signalfd4,		"signalfd4"	}, /* 360 */
+	{ 2,	TD,	sys_eventfd2,		"eventfd2"	}, /* 361 */
+	{ 1,	TD,	sys_epoll_create1,	"epoll_create1"	}, /* 362 */
+	{ 3,	TD,	sys_dup3,		"dup3"		}, /* 363 */
+	{ 2,	TD,	sys_pipe2,		"pipe2"		}, /* 364 */
+	{ 1,	TD,	sys_inotify_init1,	"inotify_init1"	}, /* 365 */
+	{ 5,	TD,	sys_preadv,		"preadv"	}, /* 366 */
+	{ 5,	TD,	sys_pwritev,		"pwritev"	}, /* 367 */
+	{ 4,	TP|TS,	sys_rt_tgsigqueueinfo,	"rt_tgsigqueueinfo"	}, /* 368 */
+	{ 5,	TD,	sys_perf_event_open,	"perf_event_open"	}, /* 369 */
+	{ 5,	TN,	sys_recvmmsg,		"recvmmsg"	}, /* 370 */
+	{ 2,	TD,	sys_fanotify_init,	"fanotify_init"	}, /* 371 */
+	{ 5,	TD|TF,	sys_fanotify_mark,	"fanotify_mark"	}, /* 372 */
+	{ 4,	0,	sys_prlimit64,		"prlimit64"	}, /* 373 */
+	{ 3,	0,	sys_cacheflush,		"cacheflush"	}, /* 374 */
+	{ 5,	TD|TF,	sys_name_to_handle_at,	"name_to_handle_at"	}, /* 375 */
+	{ 3,	TD,	sys_open_by_handle_at,	"open_by_handle_at"	}, /* 376 */
+	{ 2,	0,	sys_clock_adjtime,	"clock_adjtime"	}, /* 377 */
+	{ 1,	TD,	sys_syncfs,		"syncfs"	}, /* 378 */
+	{ 2,	TD,	sys_setns,		"setns"		}, /* 379 */
+	{ 4,	TN,	sys_sendmmsg,		"sendmmsg"	}, /* 380 */
--- a/linux/dummy.h
+++ b/linux/dummy.h
@ -24,202 +24,136 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id$
 */

 /* still unfinished */
+#define	sys_add_key		printargs
+#define	sys_fanotify_init	printargs
+#define	sys_fanotify_mark	printargs
 #define	sys_ioperm		printargs
-#define	sys_syslog		printargs
 #define	sys_iopl		printargs
-#define	sys_vm86old		printargs
-#define	sys_get_kernel_syms	printargs
-#define	sys_bdflush		printargs
+#define	sys_ioprio_get		printargs
+#define	sys_ioprio_set		printargs
+#define	sys_kexec_load		printargs
+#define	sys_keyctl		printargs
+#define	sys_lookup_dcookie	printargs
+#define	sys_name_to_handle_at	printargs
+#define	sys_open_by_handle_at	printargs
+#define	sys_perf_event_open	printargs
+#define	sys_request_key		printargs
+#define	sys_sync_file_range	printargs
 #define	sys_sysfs		printargs
-#define	sys_afs_syscall		printargs
+#define	sys_vm86old		printargs
+#define	sys_vm86		printargs

 /* machine-specific */
 #ifndef I386
 #define	sys_modify_ldt		printargs
-#define sys_get_thread_area	printargs
-#define sys_set_thread_area	printargs
+#ifndef M68K
+#define	sys_get_thread_area	printargs
+#define	sys_set_thread_area	printargs
+#endif
 #endif

-#define sys_sched_yield		printargs
-#define sys_sched_get_priority_max sys_sched_get_priority_min
-#define sys_sched_rr_get_interval printargs
-
 /* like another call */
-#define	sys_uselib		sys_chdir
-#define	sys_umount		sys_chdir
-#define	sys_swapon		sys_chdir
-#define	sys_swapoff		sys_chdir
-#define	sys_delete_module	sys_open
-#define	sys_fchdir		sys_close
-#define	sys_setfsuid		sys_setuid
-#define	sys_setfsgid		sys_setgid
 #define	sys_acct		sys_chdir
-#define sys_fdatasync		sys_close
-#define sys_mlock		sys_munmap
-#define sys_munlock		sys_munmap
-#define sys_clock_getres	sys_clock_gettime
-#define sys_mq_unlink		sys_unlink
+#define	sys_chroot		sys_chdir
+#define	sys_clock_getres	sys_clock_gettime
+#define	sys_delete_module	sys_open
+#define	sys_dup			sys_close
+#define	sys_fchdir		sys_close
+#define	sys_fdatasync		sys_close
+#define	sys_fsync		sys_close
+#define	sys_getegid		sys_getuid
+#define	sys_geteuid		sys_getuid
+#define	sys_getgid		sys_getuid
+#define	sys_getresgid		sys_getresuid
+#define	sys_mlock		sys_munmap
+#define	sys_mq_unlink		sys_chdir
+#define	sys_munlock		sys_munmap
+#define	sys_pivotroot		sys_link
+#define	sys_rename		sys_link
+#define	sys_rmdir		sys_chdir
+#define	sys_sched_get_priority_max	sys_sched_get_priority_min
+#define	sys_set_robust_list	sys_munmap
+#define	sys_setfsgid		sys_setfsuid
+#define	sys_setgid		sys_setuid
+#define	sys_setns		sys_inotify_rm_watch
+#define	sys_setregid		sys_setreuid
+#define	sys_setresgid		sys_setresuid
+#define	sys_swapoff		sys_chdir
+#define	sys_symlink		sys_link
+#define	sys_syncfs		sys_close
+#define	sys_umount		sys_chdir
+#define	sys_unlink		sys_chdir
+#define	sys_uselib		sys_chdir

 /* printargs does the right thing */
-#define	sys_setup		printargs
-#define	sys_getpid		printargs
-#define	sys_getuid		printargs
-#define	sys_pause		printargs
-#define	sys_sync		printargs
-#define	sys_getgid		printargs
-#define	sys_geteuid		printargs
-#define	sys_getegid		printargs
-#define	sys_getppid		printargs
-#define	sys_getpgrp		printargs
-#define	sys_setsid		printargs
-#define	sys_vhangup		printargs
-#define	sys_idle		printargs
 #define	sys_getpgid		printargs
-#define sys_munlockall		printargs
-#define sys_timer_getoverrun	printargs
-#define sys_timer_delete	printargs
+#define	sys_getpid		printargs
+#define	sys_getppid		printargs
+#define	sys_gettid		printargs
+#define	sys_idle		printargs
+#define	sys_inotify_init	printargs
+#define	sys_munlockall		printargs
+#define	sys_pause		printargs
+#define	sys_rt_sigreturn	printargs
+#define	sys_sched_yield		printargs
+#define	sys_setsid		printargs
+#define	sys_set_tid_address	printargs
+#define	sys_setup		printargs
+#define	sys_sync		printargs
+#define	sys_timer_delete	printargs
+#define	sys_timer_getoverrun	printargs
+#define	sys_vhangup		printargs

-/* subcall entry points */
-#define	sys_socketcall		printargs
-#define	sys_ipc			printargs
+/* printargs_lu/ld does the right thing */
+#define	sys_alarm		printargs_lu
+#define	sys_getpgrp		printargs_lu
+#define	sys_getsid		printargs_lu
+#define	sys_nice		printargs_ld
+#define	sys_setpgid		printargs_lu
+#define	sys_setpgrp		printargs_lu

 /* unimplemented */
-#define	sys_stty		printargs
-#define	sys_gtty		printargs
+#define	sys_afs_syscall		printargs
+#define	sys_break		printargs
 #define	sys_ftime		printargs
-#define	sys_prof		printargs
-#define	sys_phys		printargs
+#define	sys_get_kernel_syms	printargs
+#define	sys_gtty		printargs
 #define	sys_lock		printargs
 #define	sys_mpx			printargs
-#define	sys_ulimit		printargs
+#define	sys_nfsservctl		printargs
+#define	sys_phys		printargs
 #define	sys_profil		printargs
+#define	sys_prof		printargs
+#define	sys_security		printargs
+#define	sys_stty		printargs
+#define	sys_tuxcall		printargs
+#define	sys_ulimit		printargs
 #define	sys_ustat		printargs
-#define	sys_break		printargs
+#define	sys_vserver		printargs

 /* deprecated */
-#define	sys_olduname		printargs
+#define	sys_bdflush		printargs
 #define	sys_oldolduname		printargs
+#define	sys_olduname		printargs

 /* no library support */
 #ifndef HAVE_SENDMSG
-#define sys_sendmsg		printargs
-#define sys_recvmsg		printargs
+#define	sys_recvmsg		printargs
+#define	sys_sendmsg		printargs
 #endif

 #ifndef SYS_getpmsg
-#define sys_getpmsg		printargs
+#define	sys_getpmsg		printargs
 #endif
 #ifndef SYS_putpmsg
-#define sys_putpmsg		printargs
+#define	sys_putpmsg		printargs
 #endif

 #ifndef HAVE_STRUCT___OLD_KERNEL_STAT
-#define sys_oldstat		printargs
-#define sys_oldfstat		printargs
-#define sys_oldlstat		printargs
-#endif
-
-#if DONE
-#define sys_oldselect		printargs
-#define	sys_msync		printargs
-#define	sys_flock		printargs
-#define	sys_getdents		printargs
-#define	sys_stime		printargs
-#define	sys_time		printargs
-#define	sys_times		printargs
-#define	sys_mount		printargs
-#define	sys_nice		printargs
-#define	sys_mprotect		printargs
-#define	sys_sigprocmask		printargs
-#define	sys_adjtimex		printargs
-#define	sys_sysinfo		printargs
-#define	sys_ipc			printargs
-#define	sys_setdomainname	printargs
-#define	sys_statfs		printargs
-#define	sys_fstatfs		printargs
-#define	sys_ptrace		printargs
-#define	sys_sigreturn		printargs
-#define	sys_fsync		printargs
-#define	sys_alarm		printargs
-#define	sys_socketcall		printargs
-#define	sys_sigsuspend		printargs
-#define	sys_utime		printargs
-#define	sys_brk			printargs
-#define	sys_mmap		printargs
-#define	sys_munmap		printargs
-#define	sys_select		printargs
-#define	sys_setuid		printargs
-#define	sys_setgid		printargs
-#define	sys_setreuid		printargs
-#define	sys_setregid		printargs
-#define	sys_getgroups		printargs
-#define	sys_setgroups		printargs
-#define	sys_setrlimit		printargs
-#define	sys_getrlimit		printargs
-#define	sys_getrusage		printargs
-#define	sys_getpriority		printargs
-#define	sys_setpriority		printargs
-#define	sys_setpgid		printargs
-#define	sys_access		printargs
-#define	sys_sethostname		printargs
-#define	sys_readdir		printargs
-#define	sys_waitpid		printargs
-#define	sys_wait4		printargs
-#define	sys_execve		printargs
-#define	sys_fork		printargs
-#define	sys_uname		printargs
-#define	sys_pipe		printargs
-#define	sys_siggetmask		printargs
-#define	sys_sigsetmask		printargs
-#define	sys_exit		printargs
-#define	sys_kill		printargs
-#define	sys_signal		printargs
-#define	sys_sigaction		printargs
-#define	sys_sigpending		printargs
-#define	sys_fcntl		printargs
-#define	sys_dup			printargs
-#define	sys_dup2		printargs
-#define	sys_close		printargs
-#define	sys_ioctl		printargs
-#define	sys_read		printargs
-#define	sys_write		printargs
-#define	sys_open		printargs
-#define	sys_creat		printargs
-#define	sys_link		printargs
-#define	sys_unlink		printargs
-#define	sys_chdir		printargs
-#define	sys_mknod		printargs
-#define	sys_chmod		printargs
-#define	sys_chown		printargs
-#define	sys_lseek		printargs
-#define	sys_rename		printargs
-#define	sys_mkdir		printargs
-#define	sys_rmdir		printargs
-#define	sys_umask		printargs
-#define	sys_chroot		printargs
-#define	sys_gettimeofday	printargs
-#define	sys_settimeofday	printargs
-#define	sys_symlink		printargs
-#define	sys_readlink		printargs
-#define	sys_truncate		printargs
-#define	sys_ftruncate		printargs
-#define	sys_fchmod		printargs
-#define	sys_fchown		printargs
-#define	sys_setitimer		printargs
-#define	sys_getitimer		printargs
-#define	sys_stat		printargs
-#define	sys_lstat		printargs
-#define	sys_fstat		printargs
-#define	sys_personality		printargs
-#define sys_poll		printargs
-#define	sys_create_module	printargs
-#define	sys_init_module		printargs
-#define	sys_quotactl		printargs
-#define sys_mlockall		printargs
-#define	sys_reboot		printargs
+#define	sys_oldfstat		printargs
+#define	sys_oldlstat		printargs
+#define	sys_oldstat		printargs
 #endif
--- a/linux/dummy_check.sh
+++ b/linux/dummy_check.sh
@ -0,0 +1,6 @@
+#!/bin/sh
+
+grep '^#define' dummy.h | cut -f2 | \
+while read func; do
+	grep -q -F -- "${func}(" syscall.h && echo "Defined as macro and as func: $func"
+done
--- a/linux/errnoent.h
+++ b/linux/errnoent.h
@ -135,7 +135,7 @@
 	"EOWNERDEAD", /* 130 */
 	"ENOTRECOVERABLE", /* 131 */
 	"ERFKILL", /* 132 */
-	"ERRNO_133", /* 133 */
+	"EHWPOISON", /* 133 */
 	"ERRNO_134", /* 134 */
 	"ERRNO_135", /* 135 */
 	"ERRNO_136", /* 136 */
--- a/linux/hppa/.cvsignore
+++ b/linux/hppa/.cvsignore
@ -1,3 +0,0 @@
-Makefile
-ioctldefs.h
-ioctls.h
--- a/linux/hppa/ioctlent.h
+++ b/linux/hppa/ioctlent.h
@ -1,779 +0,0 @@
-	{"linux/fs.h",	"FIBMAP",	0x1},
-	{"linux/fs.h",	"FIGETBSZ",	0x2},
-	{"linux/fd.h",	"FDGETPRM",	0x204},
-	{"linux/fd.h",	"FDGETMAXERRS",	0x20e},
-	{"linux/fd.h",	"FDGETDRVTYP",	0x20f},
-	{"linux/fd.h",	"FDGETDRVPRM",	0x211},
-	{"linux/fd.h",	"FDGETDRVSTAT",	0x212},
-	{"linux/fd.h",	"FDPOLLDRVSTAT",	0x213},
-	{"linux/fd.h",	"FDGETFDCSTAT",	0x215},
-	{"linux/fd.h",	"FDWERRORGET",	0x217},
-	{"linux/fd.h",	"FDCLRPRM",	0x241},
-	{"linux/fd.h",	"FDSETPRM",	0x242},
-	{"linux/fd.h",	"FDDEFPRM",	0x243},
-	{"linux/fd.h",	"FDMSGON",	0x245},
-	{"linux/fd.h",	"FDMSGOFF",	0x246},
-	{"linux/fd.h",	"FDFMTBEG",	0x247},
-	{"linux/fd.h",	"FDFMTTRK",	0x248},
-	{"linux/fd.h",	"FDFMTEND",	0x249},
-	{"linux/fd.h",	"FDSETEMSGTRESH",	0x24a},
-	{"linux/fd.h",	"FDFLUSH",	0x24b},
-	{"linux/fd.h",	"FDSETMAXERRS",	0x24c},
-	{"linux/fd.h",	"FDRESET",	0x254},
-	{"linux/fd.h",	"FDWERRORCLR",	0x256},
-	{"linux/fd.h",	"FDRAWCMD",	0x258},
-	{"linux/fd.h",	"FDTWADDLE",	0x259},
-	{"linux/fd.h",	"FDEJECT",	0x25a},
-	{"linux/fd.h",	"FDSETDRVPRM",	0x290},
-	{"linux/umsdos_fs.h",	"UMSDOS_READDIR_DOS",	0x4d2},
-	{"linux/umsdos_fs.h",	"UMSDOS_UNLINK_DOS",	0x4d3},
-	{"linux/umsdos_fs.h",	"UMSDOS_RMDIR_DOS",	0x4d4},
-	{"linux/umsdos_fs.h",	"UMSDOS_STAT_DOS",	0x4d5},
-	{"linux/umsdos_fs.h",	"UMSDOS_CREAT_EMD",	0x4d6},
-	{"linux/umsdos_fs.h",	"UMSDOS_UNLINK_EMD",	0x4d7},
-	{"linux/umsdos_fs.h",	"UMSDOS_READDIR_EMD",	0x4d8},
-	{"linux/umsdos_fs.h",	"UMSDOS_GETVERSION",	0x4d9},
-	{"linux/umsdos_fs.h",	"UMSDOS_INIT_EMD",	0x4da},
-	{"linux/umsdos_fs.h",	"UMSDOS_DOS_SETUP",	0x4db},
-	{"linux/umsdos_fs.h",	"UMSDOS_RENAME_DOS",	0x4dc},
-	{"linux/fs.h",	"BLKROSET",	0x125d},
-	{"linux/fs.h",	"BLKROGET",	0x125e},
-	{"linux/fs.h",	"BLKRRPART",	0x125f},
-	{"linux/fs.h",	"BLKGETSIZE",	0x1260},
-	{"linux/fs.h",	"BLKFLSBUF",	0x1261},
-	{"linux/fs.h",	"BLKRASET",	0x1262},
-	{"linux/fs.h",	"BLKRAGET",	0x1263},
-	{"linux/fs.h",	"BLKFRASET",	0x1264},
-	{"linux/fs.h",	"BLKFRAGET",	0x1265},
-	{"linux/fs.h",	"BLKSECTSET",	0x1266},
-	{"linux/fs.h",	"BLKSECTGET",	0x1267},
-	{"linux/fs.h",	"BLKSSZGET",	0x1268},
-	{"linux/blkpg.h",	"BLKPG",	0x1269},
-	{"linux/fs.h",	"BLKPG",	0x1269},
-	{"linux/elevator.h",	"BLKELVGET",	0x126a},
-	{"linux/fs.h",	"BLKELVGET",	0x126a},
-	{"linux/elevator.h",	"BLKELVSET",	0x126b},
-	{"linux/fs.h",	"BLKELVSET",	0x126b},
-	{"linux/fs.h",	"BLKBSZGET",	0x1270},
-	{"linux/fs.h",	"BLKBSZSET",	0x1271},
-	{"linux/fs.h",	"BLKGETSIZE64",	0x1272},
-	{"linux/agpgart.h",	"AGPIOC_INFO",	0x4100},
-	{"linux/agpgart.h",	"AGPIOC_ACQUIRE",	0x4101},
-	{"linux/apm_bios.h",	"APM_IOC_STANDBY",	0x4101},
-	{"linux/agpgart.h",	"AGPIOC_RELEASE",	0x4102},
-	{"linux/apm_bios.h",	"APM_IOC_SUSPEND",	0x4102},
-	{"linux/agpgart.h",	"AGPIOC_SETUP",	0x4103},
-	{"linux/agpgart.h",	"AGPIOC_RESERVE",	0x4104},
-	{"linux/agpgart.h",	"AGPIOC_PROTECT",	0x4105},
-	{"linux/agpgart.h",	"AGPIOC_ALLOCATE",	0x4106},
-	{"linux/agpgart.h",	"AGPIOC_DEALLOCATE",	0x4107},
-	{"linux/agpgart.h",	"AGPIOC_BIND",	0x4108},
-	{"linux/agpgart.h",	"AGPIOC_UNBIND",	0x4109},
-	{"linux/pmu.h",	"PMU_IOC_SLEEP",	0x4200},
-	{"linux/cciss_ioctl.h",	"CCISS_GETPCIINFO",	0x4201},
-	{"linux/pmu.h",	"PMU_IOC_GET_BACKLIGHT",	0x4201},
-	{"linux/cciss_ioctl.h",	"CCISS_GETINTINFO",	0x4202},
-	{"linux/pmu.h",	"PMU_IOC_SET_BACKLIGHT",	0x4202},
-	{"linux/cciss_ioctl.h",	"CCISS_SETINTINFO",	0x4203},
-	{"linux/pmu.h",	"PMU_IOC_GET_MODEL",	0x4203},
-	{"linux/cciss_ioctl.h",	"CCISS_GETNODENAME",	0x4204},
-	{"linux/pmu.h",	"PMU_IOC_HAS_ADB",	0x4204},
-	{"linux/cciss_ioctl.h",	"CCISS_SETNODENAME",	0x4205},
-	{"linux/pmu.h",	"PMU_IOC_CAN_SLEEP",	0x4205},
-	{"linux/cciss_ioctl.h",	"CCISS_GETHEARTBEAT",	0x4206},
-	{"linux/cciss_ioctl.h",	"CCISS_GETBUSTYPES",	0x4207},
-	{"linux/cciss_ioctl.h",	"CCISS_GETFIRMVER",	0x4208},
-	{"linux/cciss_ioctl.h",	"CCISS_GETDRIVVER",	0x4209},
-	{"linux/cciss_ioctl.h",	"CCISS_REVALIDVOLS",	0x420a},
-	{"linux/cciss_ioctl.h",	"CCISS_PASSTHRU",	0x420b},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RESET",	0x4300},
-	{"linux/capi.h",	"CAPI_REGISTER",	0x4301},
-	{"linux/soundcard.h",	"SNDCTL_COPR_LOAD",	0x4301},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RDATA",	0x4302},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RCODE",	0x4303},
-	{"linux/soundcard.h",	"SNDCTL_COPR_WDATA",	0x4304},
-	{"linux/soundcard.h",	"SNDCTL_COPR_WCODE",	0x4305},
-	{"linux/capi.h",	"CAPI_GET_MANUFACTURER",	0x4306},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RUN",	0x4306},
-	{"linux/capi.h",	"CAPI_GET_VERSION",	0x4307},
-	{"linux/soundcard.h",	"SNDCTL_COPR_HALT",	0x4307},
-	{"linux/capi.h",	"CAPI_GET_SERIAL",	0x4308},
-	{"linux/soundcard.h",	"SNDCTL_COPR_SENDMSG",	0x4308},
-	{"linux/capi.h",	"CAPI_GET_PROFILE",	0x4309},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RCVMSG",	0x4309},
-	{"linux/capi.h",	"CAPI_MANUFACTURER_CMD",	0x4320},
-	{"linux/capi.h",	"CAPI_GET_ERRCODE",	0x4321},
-	{"linux/capi.h",	"CAPI_INSTALLED",	0x4322},
-	{"linux/capi.h",	"CAPI_GET_FLAGS",	0x4323},
-	{"linux/capi.h",	"CAPI_SET_FLAGS",	0x4324},
-	{"linux/capi.h",	"CAPI_CLR_FLAGS",	0x4325},
-	{"linux/capi.h",	"CAPI_NCCI_OPENCOUNT",	0x4326},
-	{"linux/capi.h",	"CAPI_NCCI_GETUNIT",	0x4327},
-	{"linux/input.h",	"EVIOCGVERSION",	0x4501},
-	{"linux/input.h",	"EVIOCGID",	0x4502},
-	{"linux/input.h",	"EVIOCGREP",	0x4503},
-	{"linux/input.h",	"EVIOCSREP",	0x4503},
-	{"linux/input.h",	"EVIOCGKEYCODE",	0x4504},
-	{"linux/input.h",	"EVIOCSKEYCODE",	0x4504},
-	{"linux/input.h",	"EVIOCGKEY",	0x4505},
-	{"linux/input.h",	"EVIOCGBUS",	0x4507},
-	{"linux/input.h",	"EVIOCRMFF",	0x4581},
-	{"linux/input.h",	"EVIOCSGAIN",	0x4582},
-	{"linux/input.h",	"EVIOCSAUTOCENTER",	0x4583},
-	{"linux/input.h",	"EVIOCGEFFECTS",	0x4584},
-	{"linux/fb.h",	"FBIOGET_VBLANK",	0x4612},
-	{"linux/hiddev.h",	"HIDIOCGVERSION",	0x4801},
-	{"linux/hiddev.h",	"HIDIOCAPPLICATION",	0x4802},
-	{"linux/hiddev.h",	"HIDIOCGDEVINFO",	0x4803},
-	{"linux/hiddev.h",	"HIDIOCGSTRING",	0x4804},
-	{"linux/hiddev.h",	"HIDIOCINITREPORT",	0x4805},
-	{"linux/hiddev.h",	"HIDIOCGREPORT",	0x4807},
-	{"linux/hiddev.h",	"HIDIOCSREPORT",	0x4808},
-	{"linux/hiddev.h",	"HIDIOCGREPORTINFO",	0x4809},
-	{"linux/hiddev.h",	"HIDIOCGFIELDINFO",	0x480a},
-	{"linux/hiddev.h",	"HIDIOCGUSAGE",	0x480b},
-	{"linux/hiddev.h",	"HIDIOCSUSAGE",	0x480c},
-	{"linux/hiddev.h",	"HIDIOCGUCODE",	0x480d},
-	{"linux/isdn.h",	"IIOCNETAIF",	0x4901},
-	{"linux/isdn.h",	"IIOCNETDIF",	0x4902},
-	{"linux/isdn.h",	"IIOCNETSCF",	0x4903},
-	{"linux/isdn.h",	"IIOCNETGCF",	0x4904},
-	{"linux/isdn.h",	"IIOCNETANM",	0x4905},
-	{"linux/isdn.h",	"IIOCNETDNM",	0x4906},
-	{"linux/isdn.h",	"IIOCNETGNM",	0x4907},
-	{"linux/isdn.h",	"IIOCGETSET",	0x4908},
-	{"linux/isdn.h",	"IIOCSETSET",	0x4909},
-	{"linux/isdn.h",	"IIOCSETVER",	0x490a},
-	{"linux/isdn.h",	"IIOCNETHUP",	0x490b},
-	{"linux/isdn.h",	"IIOCSETGST",	0x490c},
-	{"linux/isdn.h",	"IIOCSETBRJ",	0x490d},
-	{"linux/isdn.h",	"IIOCSIGPRF",	0x490e},
-	{"linux/isdn.h",	"IIOCGETPRF",	0x490f},
-	{"linux/isdn.h",	"IIOCSETPRF",	0x4910},
-	{"linux/isdn.h",	"IIOCGETMAP",	0x4911},
-	{"linux/isdn.h",	"IIOCSETMAP",	0x4912},
-	{"linux/isdn.h",	"IIOCNETASL",	0x4913},
-	{"linux/isdn.h",	"IIOCNETDIL",	0x4914},
-	{"linux/isdn.h",	"IIOCGETCPS",	0x4915},
-	{"linux/isdn.h",	"IIOCGETDVR",	0x4916},
-	{"linux/isdn.h",	"IIOCNETLCR",	0x4917},
-	{"linux/isdn.h",	"IIOCNETDWRSET",	0x4918},
-	{"linux/isdn.h",	"IIOCNETALN",	0x4920},
-	{"linux/isdn.h",	"IIOCNETDLN",	0x4921},
-	{"linux/isdn.h",	"IIOCNETGPN",	0x4922},
-	{"linux/isdn.h",	"IIOCDBGVAR",	0x497f},
-	{"linux/isdn.h",	"IIOCDRVCTL",	0x4980},
-	{"linux/soundcard.h",	"SOUND_MIXER_INFO",	0x4d65},
-	{"linux/soundcard.h",	"SOUND_OLD_MIXER_INFO",	0x4d65},
-	{"linux/soundcard.h",	"SOUND_MIXER_ACCESS",	0x4d66},
-	{"linux/soundcard.h",	"SOUND_MIXER_AGC",	0x4d67},
-	{"linux/soundcard.h",	"SOUND_MIXER_3DSE",	0x4d68},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE1",	0x4d6f},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE2",	0x4d70},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE3",	0x4d71},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE4",	0x4d72},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE5",	0x4d73},
-	{"linux/soundcard.h",	"SOUND_MIXER_GETLEVELS",	0x4d74},
-	{"linux/soundcard.h",	"SOUND_MIXER_SETLEVELS",	0x4d75},
-	{"linux/soundcard.h",	"OSS_GETVERSION",	0x4d76},
-	{"linux/soundcard.h",	"SNDCTL_DSP_RESET",	0x5000},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SYNC",	0x5001},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SPEED",	0x5002},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_RATE",	0x5002},
-	{"linux/soundcard.h",	"SNDCTL_DSP_STEREO",	0x5003},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETBLKSIZE",	0x5004},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETFMT",	0x5005},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_BITS",	0x5005},
-	{"linux/soundcard.h",	"SNDCTL_DSP_CHANNELS",	0x5006},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_CHANNELS",	0x5006},
-	{"linux/soundcard.h",	"SOUND_PCM_WRITE_FILTER",	0x5007},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_FILTER",	0x5007},
-	{"linux/soundcard.h",	"SNDCTL_DSP_POST",	0x5008},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SUBDIVIDE",	0x5009},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETFRAGMENT",	0x500a},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETFMTS",	0x500b},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETOSPACE",	0x500c},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETISPACE",	0x500d},
-	{"linux/soundcard.h",	"SNDCTL_DSP_NONBLOCK",	0x500e},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETCAPS",	0x500f},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETTRIGGER",	0x5010},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETTRIGGER",	0x5010},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETIPTR",	0x5011},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETOPTR",	0x5012},
-	{"linux/soundcard.h",	"SNDCTL_DSP_MAPINBUF",	0x5013},
-	{"linux/soundcard.h",	"SNDCTL_DSP_MAPOUTBUF",	0x5014},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETSYNCRO",	0x5015},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETDUPLEX",	0x5016},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETODELAY",	0x5017},
-	{"linux/soundcard.h",	"SNDCTL_DSP_PROFILE",	0x5017},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETCHANNELMASK",	0x5040},
-	{"linux/soundcard.h",	"SNDCTL_DSP_BIND_CHANNEL",	0x5041},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETSPDIF",	0x5042},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETSPDIF",	0x5043},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_RESET",	0x5100},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_SYNC",	0x5101},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_INFO",	0x5102},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_CTRLRATE",	0x5103},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_GETOUTCOUNT",	0x5104},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_GETINCOUNT",	0x5105},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_PERCMODE",	0x5106},
-	{"linux/soundcard.h",	"SNDCTL_FM_LOAD_INSTR",	0x5107},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_TESTMIDI",	0x5108},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_RESETSAMPLES",	0x5109},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_NRSYNTHS",	0x510a},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_NRMIDIS",	0x510b},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_INFO",	0x510c},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_THRESHOLD",	0x510d},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_MEMAVL",	0x510e},
-	{"linux/soundcard.h",	"SNDCTL_FM_4OP_ENABLE",	0x510f},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_PANIC",	0x5111},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_OUTOFBAND",	0x5112},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_GETTIME",	0x5113},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_ID",	0x5114},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_CONTROL",	0x5115},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_REMOVESAMPLE",	0x5116},
-	{"linux/random.h",	"RNDGETENTCNT",	0x5200},
-	{"linux/random.h",	"RNDADDTOENTCNT",	0x5201},
-	{"linux/random.h",	"RNDGETPOOL",	0x5202},
-	{"linux/random.h",	"RNDADDENTROPY",	0x5203},
-	{"linux/random.h",	"RNDZAPENTCNT",	0x5204},
-	{"linux/random.h",	"RNDCLEARPOOL",	0x5206},
-	{"linux/soundcard.h",	"SNDCTL_TMR_TIMEBASE",	0x5401},
-	{"linux/soundcard.h",	"SNDCTL_TMR_START",	0x5402},
-	{"linux/soundcard.h",	"SNDCTL_TMR_STOP",	0x5403},
-	{"linux/soundcard.h",	"SNDCTL_TMR_CONTINUE",	0x5404},
-	{"linux/soundcard.h",	"SNDCTL_TMR_TEMPO",	0x5405},
-	{"linux/soundcard.h",	"SNDCTL_TMR_SOURCE",	0x5406},
-	{"linux/soundcard.h",	"SNDCTL_TMR_METRONOME",	0x5407},
-	{"linux/soundcard.h",	"SNDCTL_TMR_SELECT",	0x5408},
-	{"linux/if_tun.h",	"TUNSETNOCSUM",	0x54c8},
-	{"linux/if_tun.h",	"TUNSETDEBUG",	0x54c9},
-	{"linux/if_tun.h",	"TUNSETIFF",	0x54ca},
-	{"linux/if_tun.h",	"TUNSETPERSIST",	0x54cb},
-	{"linux/if_tun.h",	"TUNSETOWNER",	0x54cc},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CONTROL",	0x5500},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_BULK",	0x5502},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_RESETEP",	0x5503},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_SETINTERFACE",	0x5504},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_SETCONFIGURATION",	0x5505},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_GETDRIVER",	0x5508},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_SUBMITURB",	0x550a},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_DISCARDURB",	0x550b},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_REAPURB",	0x550c},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_REAPURBNDELAY",	0x550d},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_DISCSIGNAL",	0x550e},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CLAIMINTERFACE",	0x550f},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_RELEASEINTERFACE",	0x5510},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CONNECTINFO",	0x5511},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_IOCTL",	0x5512},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_HUB_PORTINFO",	0x5513},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_RESET",	0x5514},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CLEAR_HALT",	0x5515},
-	{"linux/watchdog.h",	"WDIOC_GETSUPPORT",	0x5700},
-	{"linux/watchdog.h",	"WDIOC_GETSTATUS",	0x5701},
-	{"linux/watchdog.h",	"WDIOC_GETBOOTSTATUS",	0x5702},
-	{"linux/watchdog.h",	"WDIOC_GETTEMP",	0x5703},
-	{"linux/watchdog.h",	"WDIOC_SETOPTIONS",	0x5704},
-	{"linux/watchdog.h",	"WDIOC_KEEPALIVE",	0x5705},
-	{"linux/watchdog.h",	"WDIOC_SETTIMEOUT",	0x5706},
-	{"linux/watchdog.h",	"WDIOC_GETTIMEOUT",	0x5707},
-	{"linux/ite_gpio.h",	"ITE_GPIO_IN",	0x5a00},
-	{"linux/ite_gpio.h",	"ITE_GPIO_OUT",	0x5a01},
-	{"linux/ite_gpio.h",	"ITE_GPIO_INT_CTRL",	0x5a02},
-	{"linux/ite_gpio.h",	"ITE_GPIO_IN_STATUS",	0x5a03},
-	{"linux/ite_gpio.h",	"ITE_GPIO_OUT_STATUS",	0x5a04},
-	{"linux/ite_gpio.h",	"ITE_GPIO_GEN_CTRL",	0x5a05},
-	{"linux/ite_gpio.h",	"ITE_GPIO_INT_WAIT",	0x5a06},
-	{"linux/sonet.h",	"SONET_GETSTAT",	0x6110},
-	{"linux/sonet.h",	"SONET_GETSTATZ",	0x6111},
-	{"linux/sonet.h",	"SONET_SETDIAG",	0x6112},
-	{"linux/sonet.h",	"SONET_CLRDIAG",	0x6113},
-	{"linux/sonet.h",	"SONET_GETDIAG",	0x6114},
-	{"linux/sonet.h",	"SONET_SETFRAMING",	0x6115},
-	{"linux/sonet.h",	"SONET_GETFRAMING",	0x6116},
-	{"linux/sonet.h",	"SONET_GETFRSENSE",	0x6117},
-	{"linux/atm_idt77105.h",	"IDT77105_GETSTAT",	0x6132},
-	{"linux/atm_idt77105.h",	"IDT77105_GETSTATZ",	0x6133},
-	{"linux/atmdev.h",	"ATM_GETSTAT",	0x6150},
-	{"linux/atmdev.h",	"ATM_GETSTATZ",	0x6151},
-	{"linux/atmdev.h",	"ATM_GETLOOP",	0x6152},
-	{"linux/atmdev.h",	"ATM_SETLOOP",	0x6153},
-	{"linux/atmdev.h",	"ATM_QUERYLOOP",	0x6154},
-	{"linux/atm_eni.h",	"ENI_MEMDUMP",	0x6160},
-	{"linux/atm_nicstar.h",	"NS_GETPSTAT",	0x6161},
-	{"linux/atm_zatm.h",	"ZATM_GETPOOL",	0x6161},
-	{"linux/atm_nicstar.h",	"NS_SETBUFLEV",	0x6162},
-	{"linux/atm_zatm.h",	"ZATM_GETPOOLZ",	0x6162},
-	{"linux/atm_nicstar.h",	"NS_ADJBUFLEV",	0x6163},
-	{"linux/atm_zatm.h",	"ZATM_SETPOOL",	0x6163},
-	{"linux/atm_zatm.h",	"ZATM_GETTHIST",	0x6164},
-	{"linux/atm_eni.h",	"ENI_SETMULT",	0x6167},
-	{"linux/atm_tcp.h",	"SIOCSIFATMTCP",	0x6180},
-	{"linux/atmdev.h",	"ATM_GETLINKRATE",	0x6181},
-	{"linux/atmdev.h",	"ATM_GETNAMES",	0x6183},
-	{"linux/atmdev.h",	"ATM_GETTYPE",	0x6184},
-	{"linux/atmdev.h",	"ATM_GETESI",	0x6185},
-	{"linux/atmdev.h",	"ATM_GETADDR",	0x6186},
-	{"linux/atmdev.h",	"ATM_RSTADDR",	0x6187},
-	{"linux/atmdev.h",	"ATM_ADDADDR",	0x6188},
-	{"linux/atmdev.h",	"ATM_DELADDR",	0x6189},
-	{"linux/atmdev.h",	"ATM_GETCIRANGE",	0x618a},
-	{"linux/atmdev.h",	"ATM_SETCIRANGE",	0x618b},
-	{"linux/atmdev.h",	"ATM_SETESI",	0x618c},
-	{"linux/atmdev.h",	"ATM_SETESIF",	0x618d},
-	{"linux/atm_tcp.h",	"ATMTCP_CREATE",	0x618e},
-	{"linux/atm_tcp.h",	"ATMTCP_REMOVE",	0x618f},
-	{"linux/atmlec.h",	"ATMLEC_CTRL",	0x61d0},
-	{"linux/atmlec.h",	"ATMLEC_DATA",	0x61d1},
-	{"linux/atmlec.h",	"ATMLEC_MCAST",	0x61d2},
-	{"linux/atmmpc.h",	"ATMMPC_CTRL",	0x61d8},
-	{"linux/atmmpc.h",	"ATMMPC_DATA",	0x61d9},
-	{"linux/atmclip.h",	"SIOCMKCLIP",	0x61e0},
-	{"linux/atmarp.h",	"ATMARPD_CTRL",	0x61e1},
-	{"linux/atmarp.h",	"ATMARP_MKIP",	0x61e2},
-	{"linux/atmarp.h",	"ATMARP_SETENTRY",	0x61e3},
-	{"linux/atmarp.h",	"ATMARP_ENCAP",	0x61e5},
-	{"linux/atmsvc.h",	"ATMSIGD_CTRL",	0x61f0},
-	{"linux/atmdev.h",	"ATM_SETSC",	0x61f1},
-	{"linux/atmdev.h",	"ATM_SETBACKEND",	0x61f2},
-	{"linux/coda.h",	"CIOC_KERNEL_VERSION",	0x630a},
-	{"linux/comstats.h",	"COM_GETPORTSTATS",	0x631e},
-	{"linux/comstats.h",	"COM_CLRPORTSTATS",	0x631f},
-	{"linux/comstats.h",	"COM_GETBRDSTATS",	0x6320},
-	{"linux/comstats.h",	"COM_READPORT",	0x6328},
-	{"linux/comstats.h",	"COM_READBOARD",	0x6329},
-	{"linux/comstats.h",	"COM_READPANEL",	0x632a},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_GET_PROTO_REV",	0x6400},
-	{"linux/video_decoder.h",	"DECODER_GET_CAPABILITIES",	0x6401},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_SET_EVENT_MASK",	0x6402},
-	{"linux/video_decoder.h",	"DECODER_GET_STATUS",	0x6402},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_RELEASE_EVENT_QUEUE",	0x6403},
-	{"linux/video_decoder.h",	"DECODER_SET_NORM",	0x6403},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_SET_DEBUG_MASK",	0x6404},
-	{"linux/video_decoder.h",	"DECODER_SET_INPUT",	0x6404},
-	{"linux/video_decoder.h",	"DECODER_SET_OUTPUT",	0x6405},
-	{"linux/video_decoder.h",	"DECODER_ENABLE_OUTPUT",	0x6406},
-	{"linux/video_decoder.h",	"DECODER_SET_PICTURE",	0x6407},
-	{"linux/video_decoder.h",	"DECODER_DUMP",	0x64c0},
-	{"linux/video_encoder.h",	"ENCODER_GET_CAPABILITIES",	0x6501},
-	{"linux/video_encoder.h",	"ENCODER_SET_NORM",	0x6502},
-	{"linux/video_encoder.h",	"ENCODER_SET_INPUT",	0x6503},
-	{"linux/video_encoder.h",	"ENCODER_SET_OUTPUT",	0x6504},
-	{"linux/video_encoder.h",	"ENCODER_ENABLE_OUTPUT",	0x6505},
-	{"linux/ext2_fs.h",	"EXT2_IOC_GETFLAGS",	0x6601},
-	{"linux/ext3_fs.h",	"EXT3_IOC_GETFLAGS",	0x6601},
-	{"linux/ext2_fs.h",	"EXT2_IOC_SETFLAGS",	0x6602},
-	{"linux/ext3_fs.h",	"EXT3_IOC_SETFLAGS",	0x6602},
-	{"linux/ext3_fs.h",	"EXT3_IOC_GETVERSION",	0x6603},
-	{"linux/ext3_fs.h",	"EXT3_IOC_SETVERSION",	0x6604},
-	{"linux/ext3_fs.h",	"EXT3_IOC_WAIT_FOR_READONLY",	0x6663},
-	{"linux/i2o-dev.h",	"I2OGETIOPS",	0x6900},
-	{"linux/i2o-dev.h",	"I2OHRTGET",	0x6901},
-	{"linux/i2o-dev.h",	"I2OLCTGET",	0x6902},
-	{"linux/i2o-dev.h",	"I2OPARMSET",	0x6903},
-	{"linux/i2o-dev.h",	"I2OPARMGET",	0x6904},
-	{"linux/i2o-dev.h",	"I2OSWDL",	0x6905},
-	{"linux/i2o-dev.h",	"I2OSWUL",	0x6906},
-	{"linux/i2o-dev.h",	"I2OSWDEL",	0x6907},
-	{"linux/i2o-dev.h",	"I2OVALIDATE",	0x6908},
-	{"linux/i2o-dev.h",	"I2OHTML",	0x6909},
-	{"linux/i2o-dev.h",	"I2OEVTREG",	0x690a},
-	{"linux/i2o-dev.h",	"I2OEVTGET",	0x690b},
-	{"linux/i8k.h",	"I8K_BIOS_VERSION",	0x6980},
-	{"linux/i8k.h",	"I8K_MACHINE_ID",	0x6981},
-	{"linux/i8k.h",	"I8K_POWER_STATUS",	0x6982},
-	{"linux/i8k.h",	"I8K_FN_STATUS",	0x6983},
-	{"linux/i8k.h",	"I8K_GET_TEMP",	0x6984},
-	{"linux/i8k.h",	"I8K_GET_SPEED",	0x6985},
-	{"linux/i8k.h",	"I8K_GET_FAN",	0x6986},
-	{"linux/i8k.h",	"I8K_SET_FAN",	0x6987},
-	{"linux/joystick.h",	"JSIOCGVERSION",	0x6a01},
-	{"linux/joystick.h",	"JSIOCGAXES",	0x6a11},
-	{"linux/joystick.h",	"JSIOCGBUTTONS",	0x6a12},
-	{"linux/joystick.h",	"JSIOCSCORR",	0x6a21},
-	{"linux/joystick.h",	"JSIOCGCORR",	0x6a22},
-	{"linux/joystick.h",	"JSIOCSAXMAP",	0x6a31},
-	{"linux/joystick.h",	"JSIOCGAXMAP",	0x6a32},
-	{"linux/joystick.h",	"JSIOCSBTNMAP",	0x6a33},
-	{"linux/joystick.h",	"JSIOCGBTNMAP",	0x6a34},
-	{"linux/udf_fs_i.h",	"UDF_GETEASIZE",	0x6c40},
-	{"linux/udf_fs_i.h",	"UDF_GETEABLOCK",	0x6c41},
-	{"linux/udf_fs_i.h",	"UDF_GETVOLIDENT",	0x6c42},
-	{"linux/udf_fs_i.h",	"UDF_RELOCATE_BLOCKS",	0x6c43},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_PRETIME",	0x6d00},
-	{"linux/synclink.h",	"MGSL_IOCSPARAMS",	0x6d00},
-	{"linux/mtio.h",	"MTIOCTOP",	0x6d01},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_MPUMODE",	0x6d01},
-	{"linux/synclink.h",	"MGSL_IOCGPARAMS",	0x6d01},
-	{"linux/mtio.h",	"MTIOCGET",	0x6d02},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_MPUCMD",	0x6d02},
-	{"linux/synclink.h",	"MGSL_IOCSTXIDLE",	0x6d02},
-	{"linux/mtio.h",	"MTIOCPOS",	0x6d03},
-	{"linux/synclink.h",	"MGSL_IOCGTXIDLE",	0x6d03},
-	{"linux/mtio.h",	"MTIOCGETCONFIG",	0x6d04},
-	{"linux/synclink.h",	"MGSL_IOCTXENABLE",	0x6d04},
-	{"linux/mtio.h",	"MTIOCSETCONFIG",	0x6d05},
-	{"linux/synclink.h",	"MGSL_IOCRXENABLE",	0x6d05},
-	{"linux/mtio.h",	"MTIOCRDFTSEG",	0x6d06},
-	{"linux/synclink.h",	"MGSL_IOCTXABORT",	0x6d06},
-	{"linux/mtio.h",	"MTIOCWRFTSEG",	0x6d07},
-	{"linux/synclink.h",	"MGSL_IOCGSTATS",	0x6d07},
-	{"linux/mtio.h",	"MTIOCVOLINFO",	0x6d08},
-	{"linux/synclink.h",	"MGSL_IOCWAITEVENT",	0x6d08},
-	{"linux/mtio.h",	"MTIOCGETSIZE",	0x6d09},
-	{"linux/synclink.h",	"MGSL_IOCLOOPTXDONE",	0x6d09},
-	{"linux/mtio.h",	"MTIOCFTFORMAT",	0x6d0a},
-	{"linux/mtio.h",	"MTIOCFTCMD",	0x6d0b},
-	{"linux/synclink.h",	"MGSL_IOCCLRMODCOUNT",	0x6d0f},
-	{"linux/zftape.h",	"MTIOC_ZFTAPE_GETBLKSZ",	0x6d68},
-	{"linux/ncp_fs.h",	"NCP_IOC_NCPREQUEST",	0x6e01},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETMOUNTUID",	0x6e02},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETMOUNTUID2",	0x6e02},
-	{"linux/ncp_fs.h",	"NCP_IOC_CONN_LOGGED_IN",	0x6e03},
-	{"linux/ncp_fs.h",	"NCP_IOC_GET_FS_INFO",	0x6e04},
-	{"linux/ncp_fs.h",	"NCP_IOC_GET_FS_INFO_V2",	0x6e04},
-	{"linux/ncp_fs.h",	"NCP_IOC_SIGN_INIT",	0x6e05},
-	{"linux/ncp_fs.h",	"NCP_IOC_SIGN_WANTED",	0x6e06},
-	{"linux/ncp_fs.h",	"NCP_IOC_SET_SIGN_WANTED",	0x6e06},
-	{"linux/ncp_fs.h",	"NCP_IOC_LOCKUNLOCK",	0x6e07},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETROOT",	0x6e08},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETROOT",	0x6e08},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETOBJECTNAME",	0x6e09},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETOBJECTNAME",	0x6e09},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETPRIVATEDATA",	0x6e0a},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETPRIVATEDATA",	0x6e0a},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETCHARSETS",	0x6e0b},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETCHARSETS",	0x6e0b},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETDENTRYTTL",	0x6e0c},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETDENTRYTTL",	0x6e0c},
-	{"linux/matroxfb.h",	"MATROXFB_SET_OUTPUT_CONNECTION",	0x6ef8},
-	{"linux/matroxfb.h",	"MATROXFB_GET_OUTPUT_CONNECTION",	0x6ef8},
-	{"linux/matroxfb.h",	"MATROXFB_GET_AVAILABLE_OUTPUTS",	0x6ef9},
-	{"linux/matroxfb.h",	"MATROXFB_SET_OUTPUT_MODE",	0x6efa},
-	{"linux/matroxfb.h",	"MATROXFB_GET_OUTPUT_MODE",	0x6efa},
-	{"linux/matroxfb.h",	"MATROXFB_GET_ALL_OUTPUTS",	0x6efb},
-	{"linux/rtc.h",	"RTC_AIE_ON",	0x7001},
-	{"linux/rtc.h",	"RTC_AIE_OFF",	0x7002},
-	{"linux/intermezzo_fs.h",	"PRESTO_GETMOUNT",	0x7003},
-	{"linux/rtc.h",	"RTC_UIE_ON",	0x7003},
-	{"linux/intermezzo_fs.h",	"PRESTO_SETPID",	0x7004},
-	{"linux/rtc.h",	"RTC_UIE_OFF",	0x7004},
-	{"linux/rtc.h",	"RTC_PIE_ON",	0x7005},
-	{"linux/intermezzo_fs.h",	"PRESTO_CLOSE_JOURNALF",	0x7006},
-	{"linux/rtc.h",	"RTC_PIE_OFF",	0x7006},
-	{"linux/intermezzo_fs.h",	"PRESTO_SET_FSETROOT",	0x7007},
-	{"linux/rtc.h",	"RTC_ALM_SET",	0x7007},
-	{"linux/intermezzo_fs.h",	"PRESTO_CLEAR_FSETROOT",	0x7008},
-	{"linux/rtc.h",	"RTC_ALM_READ",	0x7008},
-	{"linux/intermezzo_fs.h",	"PRESTO_SETOPT",	0x7009},
-	{"linux/rtc.h",	"RTC_RD_TIME",	0x7009},
-	{"linux/intermezzo_fs.h",	"PRESTO_GETOPT",	0x700a},
-	{"linux/rtc.h",	"RTC_SET_TIME",	0x700a},
-	{"linux/intermezzo_fs.h",	"PRESTO_GET_KMLSIZE",	0x700b},
-	{"linux/rtc.h",	"RTC_IRQP_READ",	0x700b},
-	{"linux/intermezzo_fs.h",	"PRESTO_GET_RECNO",	0x700c},
-	{"linux/rtc.h",	"RTC_IRQP_SET",	0x700c},
-	{"linux/rtc.h",	"RTC_EPOCH_READ",	0x700d},
-	{"linux/rtc.h",	"RTC_EPOCH_SET",	0x700e},
-	{"linux/rtc.h",	"RTC_WIE_ON",	0x700f},
-	{"linux/rtc.h",	"RTC_WKALM_SET",	0x700f},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_SETATTR",	0x7010},
-	{"linux/rtc.h",	"RTC_WIE_OFF",	0x7010},
-	{"linux/rtc.h",	"RTC_WKALM_RD",	0x7010},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_CREATE",	0x7011},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_LINK",	0x7012},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_UNLINK",	0x7013},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_SYMLINK",	0x7014},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_MKDIR",	0x7015},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_RMDIR",	0x7016},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_MKNOD",	0x7017},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_RENAME",	0x7018},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_CLOSE",	0x701a},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_IOPEN",	0x701b},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_SETEXTATTR",	0x701c},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_DELEXTATTR",	0x701d},
-	{"linux/intermezzo_fs.h",	"PRESTO_MARK",	0x7020},
-	{"linux/intermezzo_fs.h",	"PRESTO_RELEASE_PERMIT",	0x7021},
-	{"linux/intermezzo_fs.h",	"PRESTO_CLEAR_ALL_FSETROOTS",	0x7022},
-	{"linux/intermezzo_fs.h",	"PRESTO_BACKFETCH_LML",	0x7023},
-	{"linux/intermezzo_fs.h",	"PRESTO_REINT",	0x7024},
-	{"linux/intermezzo_fs.h",	"PRESTO_CANCEL_LML",	0x7025},
-	{"linux/intermezzo_fs.h",	"PRESTO_RESET_FSET",	0x7026},
-	{"linux/intermezzo_fs.h",	"PRESTO_COMPLETE_CLOSES",	0x7027},
-	{"linux/intermezzo_fs.h",	"PRESTO_REINT_BEGIN",	0x7030},
-	{"linux/intermezzo_fs.h",	"PRESTO_DO_REINT",	0x7031},
-	{"linux/intermezzo_fs.h",	"PRESTO_REINT_END",	0x7032},
-	{"linux/nvram.h",	"NVRAM_INIT",	0x7040},
-	{"linux/nvram.h",	"NVRAM_SETCKS",	0x7041},
-	{"linux/ppdev.h",	"PPSETMODE",	0x7080},
-	{"linux/ppdev.h",	"PPRSTATUS",	0x7081},
-	{"linux/ppdev.h",	"PPRCONTROL",	0x7083},
-	{"linux/ppdev.h",	"PPWCONTROL",	0x7084},
-	{"linux/ppdev.h",	"PPRDATA",	0x7085},
-	{"linux/ppdev.h",	"PPWDATA",	0x7086},
-	{"linux/ppdev.h",	"PPCLAIM",	0x708b},
-	{"linux/ppdev.h",	"PPRELEASE",	0x708c},
-	{"linux/ppdev.h",	"PPYIELD",	0x708d},
-	{"linux/ppdev.h",	"PPFCONTROL",	0x708e},
-	{"linux/ppdev.h",	"PPEXCL",	0x708f},
-	{"linux/ppdev.h",	"PPDATADIR",	0x7090},
-	{"linux/ppdev.h",	"PPNEGOT",	0x7091},
-	{"linux/ppdev.h",	"PPWCTLONIRQ",	0x7092},
-	{"linux/ppdev.h",	"PPCLRIRQ",	0x7093},
-	{"linux/ppdev.h",	"PPSETPHASE",	0x7094},
-	{"linux/ppdev.h",	"PPGETTIME",	0x7095},
-	{"linux/ppdev.h",	"PPSETTIME",	0x7096},
-	{"linux/ppdev.h",	"PPGETMODES",	0x7097},
-	{"linux/ppdev.h",	"PPGETMODE",	0x7098},
-	{"linux/ppdev.h",	"PPGETPHASE",	0x7099},
-	{"linux/ppdev.h",	"PPGETFLAGS",	0x709a},
-	{"linux/ppdev.h",	"PPSETFLAGS",	0x709b},
-	{"linux/serio.h",	"SPIOCSTYPE",	0x7101},
-	{"linux/telephony.h",	"PHONE_CAPABILITIES",	0x7180},
-	{"linux/telephony.h",	"PHONE_CAPABILITIES_LIST",	0x7181},
-	{"linux/telephony.h",	"PHONE_CAPABILITIES_CHECK",	0x7182},
-	{"linux/telephony.h",	"PHONE_RING",	0x7183},
-	{"linux/telephony.h",	"PHONE_HOOKSTATE",	0x7184},
-	{"linux/telephony.h",	"PHONE_MAXRINGS",	0x7185},
-	{"linux/telephony.h",	"PHONE_RING_CADENCE",	0x7186},
-	{"linux/telephony.h",	"OLD_PHONE_RING_START",	0x7187},
-	{"linux/telephony.h",	"PHONE_RING_START",	0x7187},
-	{"linux/telephony.h",	"PHONE_RING_STOP",	0x7188},
-	{"linux/telephony.h",	"PHONE_REC_CODEC",	0x7189},
-	{"linux/telephony.h",	"PHONE_REC_START",	0x718a},
-	{"linux/telephony.h",	"PHONE_REC_STOP",	0x718b},
-	{"linux/telephony.h",	"PHONE_REC_DEPTH",	0x718c},
-	{"linux/telephony.h",	"PHONE_FRAME",	0x718d},
-	{"linux/telephony.h",	"PHONE_REC_VOLUME",	0x718e},
-	{"linux/telephony.h",	"PHONE_REC_LEVEL",	0x718f},
-	{"linux/telephony.h",	"PHONE_PLAY_CODEC",	0x7190},
-	{"linux/telephony.h",	"PHONE_PLAY_START",	0x7191},
-	{"linux/telephony.h",	"PHONE_PLAY_STOP",	0x7192},
-	{"linux/telephony.h",	"PHONE_PLAY_DEPTH",	0x7193},
-	{"linux/telephony.h",	"PHONE_PLAY_VOLUME",	0x7194},
-	{"linux/telephony.h",	"PHONE_PLAY_LEVEL",	0x7195},
-	{"linux/telephony.h",	"PHONE_DTMF_READY",	0x7196},
-	{"linux/telephony.h",	"PHONE_GET_DTMF",	0x7197},
-	{"linux/telephony.h",	"PHONE_GET_DTMF_ASCII",	0x7198},
-	{"linux/telephony.h",	"PHONE_DTMF_OOB",	0x7199},
-	{"linux/telephony.h",	"PHONE_EXCEPTION",	0x719a},
-	{"linux/telephony.h",	"PHONE_PLAY_TONE",	0x719b},
-	{"linux/telephony.h",	"PHONE_SET_TONE_ON_TIME",	0x719c},
-	{"linux/telephony.h",	"PHONE_SET_TONE_OFF_TIME",	0x719d},
-	{"linux/telephony.h",	"PHONE_GET_TONE_ON_TIME",	0x719e},
-	{"linux/telephony.h",	"PHONE_GET_TONE_OFF_TIME",	0x719f},
-	{"linux/telephony.h",	"PHONE_GET_TONE_STATE",	0x71a0},
-	{"linux/telephony.h",	"PHONE_BUSY",	0x71a1},
-	{"linux/telephony.h",	"PHONE_RINGBACK",	0x71a2},
-	{"linux/telephony.h",	"PHONE_DIALTONE",	0x71a3},
-	{"linux/telephony.h",	"PHONE_CPT_STOP",	0x71a4},
-	{"linux/telephony.h",	"PHONE_PSTN_SET_STATE",	0x71a4},
-	{"linux/telephony.h",	"PHONE_PSTN_GET_STATE",	0x71a5},
-	{"linux/telephony.h",	"PHONE_WINK_DURATION",	0x71a6},
-	{"linux/telephony.h",	"PHONE_QUERY_CODEC",	0x71a7},
-	{"linux/telephony.h",	"PHONE_PSTN_LINETEST",	0x71a8},
-	{"linux/telephony.h",	"PHONE_VAD",	0x71a9},
-	{"linux/telephony.h",	"PHONE_WINK",	0x71aa},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_RESET",	0x71c0},
-	{"linux/ixjuser.h",	"IXJCTL_CARDTYPE",	0x71c1},
-	{"linux/ixjuser.h",	"IXJCTL_SERIAL",	0x71c2},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_TYPE",	0x71c3},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_VERSION",	0x71c4},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_IDLE",	0x71c5},
-	{"linux/ixjuser.h",	"IXJCTL_TESTRAM",	0x71c6},
-	{"linux/ixjuser.h",	"IXJCTL_SET_FILTER",	0x71c7},
-	{"linux/ixjuser.h",	"IXJCTL_GET_FILTER_HIST",	0x71c8},
-	{"linux/ixjuser.h",	"IXJCTL_INIT_TONE",	0x71c9},
-	{"linux/ixjuser.h",	"IXJCTL_TONE_CADENCE",	0x71ca},
-	{"linux/ixjuser.h",	"IXJCTL_AEC_START",	0x71cb},
-	{"linux/ixjuser.h",	"IXJCTL_AEC_STOP",	0x71cc},
-	{"linux/ixjuser.h",	"IXJCTL_AEC_GET_LEVEL",	0x71cd},
-	{"linux/ixjuser.h",	"IXJCTL_SET_LED",	0x71ce},
-	{"linux/ixjuser.h",	"IXJCTL_MIXER",	0x71cf},
-	{"linux/ixjuser.h",	"IXJCTL_DAA_COEFF_SET",	0x71d0},
-	{"linux/ixjuser.h",	"IXJCTL_PORT",	0x71d1},
-	{"linux/ixjuser.h",	"IXJCTL_DAA_AGAIN",	0x71d2},
-	{"linux/ixjuser.h",	"IXJCTL_PSTN_LINETEST",	0x71d3},
-	{"linux/ixjuser.h",	"IXJCTL_CID",	0x71d4},
-	{"linux/ixjuser.h",	"IXJCTL_POTS_PSTN",	0x71d5},
-	{"linux/ixjuser.h",	"IXJCTL_FILTER_CADENCE",	0x71d6},
-	{"linux/ixjuser.h",	"IXJCTL_PLAY_CID",	0x71d7},
-	{"linux/ixjuser.h",	"IXJCTL_VMWI",	0x71d8},
-	{"linux/ixjuser.h",	"IXJCTL_CIDCW",	0x71d9},
-	{"linux/ixjuser.h",	"IXJCTL_VERSION",	0x71da},
-	{"linux/telephony.h",	"PHONE_REC_VOLUME_LINEAR",	0x71db},
-	{"linux/telephony.h",	"PHONE_PLAY_VOLUME_LINEAR",	0x71dc},
-	{"linux/ixjuser.h",	"IXJCTL_SET_FILTER_RAW",	0x71dd},
-	{"linux/ixjuser.h",	"IXJCTL_HZ",	0x71e0},
-	{"linux/ixjuser.h",	"IXJCTL_RATE",	0x71e1},
-	{"linux/ixjuser.h",	"IXJCTL_FRAMES_READ",	0x71e2},
-	{"linux/ixjuser.h",	"IXJCTL_FRAMES_WRITTEN",	0x71e3},
-	{"linux/ixjuser.h",	"IXJCTL_READ_WAIT",	0x71e4},
-	{"linux/ixjuser.h",	"IXJCTL_WRITE_WAIT",	0x71e5},
-	{"linux/ixjuser.h",	"IXJCTL_DRYBUFFER_READ",	0x71e6},
-	{"linux/ixjuser.h",	"IXJCTL_DRYBUFFER_CLEAR",	0x71e7},
-	{"linux/ixjuser.h",	"IXJCTL_DTMF_PRESCALE",	0x71e8},
-	{"linux/ixjuser.h",	"IXJCTL_SIGCTL",	0x71e9},
-	{"linux/ixjuser.h",	"IXJCTL_SC_RXG",	0x71ea},
-	{"linux/ixjuser.h",	"IXJCTL_SC_TXG",	0x71eb},
-	{"linux/ixjuser.h",	"IXJCTL_INTERCOM_START",	0x71fd},
-	{"linux/ixjuser.h",	"IXJCTL_INTERCOM_STOP",	0x71fe},
-	{"linux/msdos_fs.h",	"VFAT_IOCTL_READDIR_BOTH",	0x7201},
-	{"linux/msdos_fs.h",	"VFAT_IOCTL_READDIR_SHORT",	0x7202},
-	{"linux/cdk.h",	"STL_BINTR",	0x7314},
-	{"linux/cdk.h",	"STL_BSTART",	0x7315},
-	{"linux/cdk.h",	"STL_BSTOP",	0x7316},
-	{"linux/cdk.h",	"STL_BRESET",	0x7317},
-	{"linux/cdk.h",	"STL_GETPFLAG",	0x7350},
-	{"linux/cdk.h",	"STL_SETPFLAG",	0x7351},
-	{"linux/if_ppp.h",	"PPPIOCGCHAN",	0x7437},
-	{"linux/if_ppp.h",	"PPPIOCATTCHAN",	0x7438},
-	{"linux/if_ppp.h",	"PPPIOCDISCONN",	0x7439},
-	{"linux/if_ppp.h",	"PPPIOCCONNECT",	0x743a},
-	{"linux/if_ppp.h",	"PPPIOCSMRRU",	0x743b},
-	{"linux/if_ppp.h",	"PPPIOCDETACH",	0x743c},
-	{"linux/if_ppp.h",	"PPPIOCATTACH",	0x743d},
-	{"linux/if_ppp.h",	"PPPIOCNEWUNIT",	0x743e},
-	{"linux/if_ppp.h",	"PPPIOCGIDLE",	0x743f},
-	{"linux/if_ppp.h",	"PPPIOCSDEBUG",	0x7440},
-	{"linux/if_ppp.h",	"PPPIOCGDEBUG",	0x7441},
-	{"linux/if_ppp.h",	"PPPIOCSACTIVE",	0x7446},
-	{"linux/if_ppp.h",	"PPPIOCSPASS",	0x7447},
-	{"linux/if_ppp.h",	"PPPIOCSNPMODE",	0x744b},
-	{"linux/if_ppp.h",	"PPPIOCGNPMODE",	0x744c},
-	{"linux/if_ppp.h",	"PPPIOCSCOMPRESS",	0x744d},
-	{"linux/if_ppp.h",	"PPPIOCXFERUNIT",	0x744e},
-	{"linux/if_ppp.h",	"PPPIOCSXASYNCMAP",	0x744f},
-	{"linux/if_ppp.h",	"PPPIOCGXASYNCMAP",	0x7450},
-	{"linux/if_ppp.h",	"PPPIOCSMAXCID",	0x7451},
-	{"linux/if_ppp.h",	"PPPIOCSMRU",	0x7452},
-	{"linux/if_ppp.h",	"PPPIOCGMRU",	0x7453},
-	{"linux/if_ppp.h",	"PPPIOCSRASYNCMAP",	0x7454},
-	{"linux/if_ppp.h",	"PPPIOCGRASYNCMAP",	0x7455},
-	{"linux/if_ppp.h",	"PPPIOCGUNIT",	0x7456},
-	{"linux/if_ppp.h",	"PPPIOCSASYNCMAP",	0x7457},
-	{"linux/if_ppp.h",	"PPPIOCGASYNCMAP",	0x7458},
-	{"linux/if_ppp.h",	"PPPIOCSFLAGS",	0x7459},
-	{"linux/if_ppp.h",	"PPPIOCGFLAGS",	0x745a},
-	{"linux/jffs.h",	"JFFS_PRINT_HASH",	0x745a},
-	{"linux/jffs.h",	"JFFS_PRINT_TREE",	0x745b},
-	{"linux/jffs.h",	"JFFS_GET_STATUS",	0x745c},
-	{"linux/isdn_ppp.h",	"PPPIOCGCALLINFO",	0x7480},
-	{"linux/isdn_ppp.h",	"PPPIOCBUNDLE",	0x7481},
-	{"linux/isdn_ppp.h",	"PPPIOCGMPFLAGS",	0x7482},
-	{"linux/isdn_ppp.h",	"PPPIOCSMPFLAGS",	0x7483},
-	{"linux/isdn_ppp.h",	"PPPIOCSMPMTU",	0x7484},
-	{"linux/isdn_ppp.h",	"PPPIOCSMPMRU",	0x7485},
-	{"linux/isdn_ppp.h",	"PPPIOCGCOMPRESSORS",	0x7486},
-	{"linux/isdn_ppp.h",	"PPPIOCSCOMPRESSOR",	0x7487},
-	{"linux/isdn_ppp.h",	"PPPIOCGIFNAME",	0x7488},
-	{"linux/toshiba.h",	"TOSH_SMM",	0x7490},
-	{"linux/smb_fs.h",	"SMB_IOC_GETMOUNTUID",	0x7501},
-	{"linux/smb_fs.h",	"SMB_IOC_NEWCONN",	0x7502},
-	{"linux/smb_fs.h",	"SMB_IOC_GETMOUNTUID32",	0x7503},
-	{"linux/sonypi.h",	"SONYPI_IOCGBRT",	0x7600},
-	{"linux/sonypi.h",	"SONYPI_IOCSBRT",	0x7600},
-	{"linux/ext2_fs.h",	"EXT2_IOC_GETVERSION",	0x7601},
-	{"linux/ext3_fs.h",	"EXT3_IOC_GETVERSION_OLD",	0x7601},
-	{"linux/videodev.h",	"VIDIOCGCAP",	0x7601},
-	{"linux/ext2_fs.h",	"EXT2_IOC_SETVERSION",	0x7602},
-	{"linux/ext3_fs.h",	"EXT3_IOC_SETVERSION_OLD",	0x7602},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT1CAP",	0x7602},
-	{"linux/videodev.h",	"VIDIOCGCHAN",	0x7602},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT1REM",	0x7603},
-	{"linux/videodev.h",	"VIDIOCSCHAN",	0x7603},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT2CAP",	0x7604},
-	{"linux/videodev.h",	"VIDIOCGTUNER",	0x7604},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT2REM",	0x7605},
-	{"linux/videodev.h",	"VIDIOCSTUNER",	0x7605},
-	{"linux/videodev.h",	"VIDIOCGPICT",	0x7606},
-	{"linux/sonypi.h",	"SONYPI_IOCGBATFLAGS",	0x7607},
-	{"linux/videodev.h",	"VIDIOCSPICT",	0x7607},
-	{"linux/sonypi.h",	"SONYPI_IOCGBLUE",	0x7608},
-	{"linux/videodev.h",	"VIDIOCCAPTURE",	0x7608},
-	{"linux/sonypi.h",	"SONYPI_IOCSBLUE",	0x7609},
-	{"linux/videodev.h",	"VIDIOCGWIN",	0x7609},
-	{"linux/videodev.h",	"VIDIOCSWIN",	0x760a},
-	{"linux/videodev.h",	"VIDIOCGFBUF",	0x760b},
-	{"linux/videodev.h",	"VIDIOCSFBUF",	0x760c},
-	{"linux/videodev.h",	"VIDIOCKEY",	0x760d},
-	{"linux/videodev.h",	"VIDIOCGFREQ",	0x760e},
-	{"linux/videodev.h",	"VIDIOCSFREQ",	0x760f},
-	{"linux/videodev.h",	"VIDIOCGAUDIO",	0x7610},
-	{"linux/videodev.h",	"VIDIOCSAUDIO",	0x7611},
-	{"linux/videodev.h",	"VIDIOCSYNC",	0x7612},
-	{"linux/videodev.h",	"VIDIOCMCAPTURE",	0x7613},
-	{"linux/videodev.h",	"VIDIOCGMBUF",	0x7614},
-	{"linux/videodev.h",	"VIDIOCGUNIT",	0x7615},
-	{"linux/videodev.h",	"VIDIOCGCAPTURE",	0x7616},
-	{"linux/videodev.h",	"VIDIOCSCAPTURE",	0x7617},
-	{"linux/videodev.h",	"VIDIOCSPLAYMODE",	0x7618},
-	{"linux/videodev.h",	"VIDIOCSWRITEMODE",	0x7619},
-	{"linux/videodev.h",	"VIDIOCGPLAYINFO",	0x761a},
-	{"linux/videodev.h",	"VIDIOCSMICROCODE",	0x761b},
-	{"linux/videodev.h",	"VIDIOCGVBIFMT",	0x761c},
-	{"linux/videodev.h",	"VIDIOCSVBIFMT",	0x761d},
-	{"linux/meye.h",	"MEYEIOC_G_PARAMS",	0x76c0},
-	{"linux/meye.h",	"MEYEIOC_S_PARAMS",	0x76c1},
-	{"linux/meye.h",	"MEYEIOC_QBUF_CAPT",	0x76c2},
-	{"linux/meye.h",	"MEYEIOC_SYNC",	0x76c3},
-	{"linux/meye.h",	"MEYEIOC_STILLCAPT",	0x76c4},
-	{"linux/meye.h",	"MEYEIOC_STILLJCAPT",	0x76c5},
-	{"linux/dn.h",	"SIOCSNETADDR",	0x89e0},
-	{"linux/dn.h",	"OSIOCSNETADDR",	0x89e0},
-	{"linux/dn.h",	"SIOCGNETADDR",	0x89e1},
-	{"linux/dn.h",	"OSIOCGNETADDR",	0x89e1},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_READY",	0x9360},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_FAIL",	0x9361},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_CATATONIC",	0x9362},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_PROTOVER",	0x9363},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_SETTIMEOUT",	0x9364},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_EXPIRE",	0x9365},
-	{"linux/auto_fs4.h",	"AUTOFS_IOC_EXPIRE_MULTI",	0x9366},
-	{"linux/nbd.h",	"NBD_SET_SOCK",	0xab00},
-	{"linux/nbd.h",	"NBD_SET_BLKSIZE",	0xab01},
-	{"linux/nbd.h",	"NBD_SET_SIZE",	0xab02},
-	{"linux/nbd.h",	"NBD_DO_IT",	0xab03},
-	{"linux/nbd.h",	"NBD_CLEAR_SOCK",	0xab04},
-	{"linux/nbd.h",	"NBD_CLEAR_QUE",	0xab05},
-	{"linux/nbd.h",	"NBD_PRINT_DEBUG",	0xab06},
-	{"linux/nbd.h",	"NBD_SET_SIZE_BLOCKS",	0xab07},
-	{"linux/nbd.h",	"NBD_DISCONNECT",	0xab08},
-	{"linux/raw.h",	"RAW_SETBIND",	0xac00},
-	{"linux/raw.h",	"RAW_GETBIND",	0xac01},
-	{"linux/if_pppox.h",	"PPPOEIOCSFWD",	0xb100},
-	{"linux/if_pppox.h",	"PPPOEIOCDFWD",	0xb101},
-	{"linux/reiserfs_fs.h",	"REISERFS_IOC_UNPACK",	0xcd01},
-	{"linux/lvm.h",	"VG_CREATE_OLD",	0xfe00},
-	{"linux/lvm.h",	"VG_REMOVE",	0xfe01},
-	{"linux/lvm.h",	"VG_EXTEND",	0xfe03},
-	{"linux/lvm.h",	"VG_REDUCE",	0xfe04},
-	{"linux/lvm.h",	"VG_STATUS",	0xfe05},
-	{"linux/lvm.h",	"VG_STATUS_GET_COUNT",	0xfe06},
-	{"linux/lvm.h",	"VG_STATUS_GET_NAMELIST",	0xfe07},
-	{"linux/lvm.h",	"VG_SET_EXTENDABLE",	0xfe08},
-	{"linux/lvm.h",	"VG_RENAME",	0xfe09},
-	{"linux/lvm.h",	"VG_CREATE",	0xfe0a},
-	{"linux/lvm.h",	"LV_CREATE",	0xfe20},
-	{"linux/lvm.h",	"LV_REMOVE",	0xfe21},
-	{"linux/lvm.h",	"LV_ACTIVATE",	0xfe22},
-	{"linux/lvm.h",	"LV_DEACTIVATE",	0xfe23},
-	{"linux/lvm.h",	"LV_EXTEND",	0xfe24},
-	{"linux/lvm.h",	"LV_REDUCE",	0xfe25},
-	{"linux/lvm.h",	"LV_STATUS_BYNAME",	0xfe26},
-	{"linux/lvm.h",	"LV_STATUS_BYINDEX",	0xfe27},
-	{"linux/lvm.h",	"LV_SET_ACCESS",	0xfe28},
-	{"linux/lvm.h",	"LV_SET_ALLOCATION",	0xfe29},
-	{"linux/lvm.h",	"LV_SET_STATUS",	0xfe2a},
-	{"linux/lvm.h",	"LE_REMAP",	0xfe2b},
-	{"linux/lvm.h",	"LV_SNAPSHOT_USE_RATE",	0xfe2c},
-	{"linux/lvm.h",	"LV_STATUS_BYDEV",	0xfe2e},
-	{"linux/lvm.h",	"LV_RENAME",	0xfe2f},
-	{"linux/lvm.h",	"LV_BMAP",	0xfe30},
-	{"linux/lvm.h",	"PV_STATUS",	0xfe40},
-	{"linux/lvm.h",	"PV_CHANGE",	0xfe41},
-	{"linux/lvm.h",	"PV_FLUSH",	0xfe42},
-	{"linux/lvm.h",	"PE_LOCK_UNLOCK",	0xfe50},
-	{"linux/lvm.h",	"LVM_GET_IOP_VERSION",	0xfe98},
-	{"linux/lvm.h",	"LVM_RESET",	0xfe99},
-	{"linux/lvm.h",	"LVM_LOCK_LVM",	0xff00},
--- a/linux/hppa/ioctlent.h.in
+++ b/linux/hppa/ioctlent.h.in
@ -0,0 +1 @@
+#include "../i386/ioctlent.h.in"
--- a/linux/hppa/syscallent.h
+++ b/linux/hppa/syscallent.h
@ -1,8 +1,5 @@
 /*
 * Copyright (c) 2001 Hewlett-Packard, Matthew Wilcox
- *
- * $Id$
- *
 */

 	{ 0,	0,	sys_restart_syscall,	"restart_syscall"	}, /* 0 */
@ -29,7 +26,7 @@
 	{ 5,	TF,	sys_mount,		"mount"			}, /* 21 */
 	{ 3,	TN,	sys_bind,		"bind"			}, /* 22 */
 	{ 1,	0,	sys_setuid,		"setuid"		}, /* 23 */
-	{ 0,	0,	sys_getuid,		"getuid"		}, /* 24 */
+	{ 0,	NF,	sys_getuid,		"getuid"		}, /* 24 */
 	{ 1,	0,	sys_stime,		"stime"			}, /* 25 */
 	{ 4,	0,	sys_ptrace,		"ptrace"		}, /* 26 */
 	{ 1,	0,	sys_alarm,		"alarm"			}, /* 27 */
@ -52,10 +49,10 @@
 	{ 3,	TN,	sys_getsockname,	"getsockname"		}, /* 44 */
 	{ 1,	0,	sys_brk,		"brk"			}, /* 45 */
 	{ 1,	0,	sys_setgid,		"setgid"		}, /* 46 */
-	{ 0,	0,	sys_getgid,		"getgid"		}, /* 47 */
+	{ 0,	NF,	sys_getgid,		"getgid"		}, /* 47 */
 	{ 2,	0,	sys_signal,		"signal"		}, /* 48 */
-	{ 0,	0,	sys_geteuid,		"geteuid"		}, /* 49 */
-	{ 0,	0,	sys_getegid,		"getegid"		}, /* 50 */
+	{ 0,	NF,	sys_geteuid,		"geteuid"		}, /* 49 */
+	{ 0,	NF,	sys_getegid,		"getegid"		}, /* 50 */
 	{ 1,	TF,	sys_acct,		"acct"			}, /* 51 */
 	{ 2,	0,	sys_umount2,		"umount2"		}, /* 52 */
 	{ 3,	TN,	sys_getpeername,	"lock"			}, /* 53 */
@ -73,8 +70,8 @@
 	{ 0,	0,	sys_getpgrp,		"getpgrp"		}, /* 65 */
 	{ 0,	0,	sys_setsid,		"setsid"		}, /* 66 */
 	{ 2,	TF,	sys_pivotroot,		"pivot_root"		}, /* 67 */
-	{ 5,	0,	printargs,		"sgetmask"		}, /* 68 */
-	{ 5,	0,	printargs,		"ssetmask"		}, /* 69 */
+	{ 0,	TS,	sys_siggetmask,		"sgetmask"		}, /* 68 */
+	{ 1,	TS,	sys_sigsetmask,		"ssetmask"		}, /* 69 */
 	{ 2,	0,	sys_setreuid,		"setreuid"		}, /* 70 */
 	{ 2,	0,	sys_setregid,		"setregid"		}, /* 71 */
 	{ 3,	0,	sys_mincore,		"mincore"		}, /* 72 */
@ -92,10 +89,10 @@
 	{ 2,	TF,	sys_lstat,		"newlstat"		}, /* 84 */
 	{ 3,	TF,	sys_readlink,		"readlink"		}, /* 85 */
 	{ 1,	0,	sys_uselib,		"uselib"		}, /* 86 */
-	{ 1,	0,	sys_swapon,		"swapon"		}, /* 87 */
-	{ 3,	0,	sys_reboot,		"reboot"		}, /* 88 */
-	{ 6,	0,	sys_mmap,		"mmap2"			}, /* 89 */
-	{ 6,	0,	sys_mmap,		"mmap"			}, /* 90 */
+	{ 2,	TF,	sys_swapon,		"swapon"		}, /* 87 */
+	{ 4,	0,	sys_reboot,		"reboot"		}, /* 88 */
+	{ 6,	TD,	sys_mmap,		"mmap2"			}, /* 89 */
+	{ 6,	TD,	sys_mmap,		"mmap"			}, /* 90 */
 	{ 2,	0,	sys_munmap,		"munmap"		}, /* 91 */
 	{ 2,	TF,	sys_truncate,		"truncate"		}, /* 92 */
 	{ 2,	TD,	sys_ftruncate,		"ftruncate"		}, /* 93 */
@ -107,7 +104,7 @@
 	{ 2,	TF,	sys_statfs,		"statfs"		}, /* 99 */
 	{ 2,	TD,	sys_fstatfs,		"fstatfs"		}, /* 100 */
 	{ 2,	TF,	sys_stat64,		"stat64"		}, /* 101 */
-	{ 5,	0,	printargs,		"SYS_102"		}, /* 102 */
+	{ 5,	0,	NULL,			NULL			}, /* 102 */
 	{ 3,	0,	sys_syslog,		"syslog"		}, /* 103 */
 	{ 3,	0,	sys_setitimer,		"setitimer"		}, /* 104 */
 	{ 2,	0,	sys_getitimer,		"getitimer"		}, /* 105 */
@ -120,7 +117,7 @@
 	{ 2,	TD,	sys_fstat64,		"fstat64"		}, /* 112 */
 	{ 0,	0,	sys_vfork,		"vfork"			}, /* 113 */
 	{ 4,	TP,	sys_wait4,		"wait4"			}, /* 114 */
-	{ 1,	0,	sys_swapoff,		"swapoff"		}, /* 115 */
+	{ 1,	TF,	sys_swapoff,		"swapoff"		}, /* 115 */
 	{ 1,	0,	sys_sysinfo,		"sysinfo"		}, /* 116 */
 	{ 2,	TN,	sys_shutdown,		"shutdown"		}, /* 117 */
 	{ 1,	TD,	sys_fsync,		"fsync"			}, /* 118 */
@ -143,8 +140,8 @@
 	{ 5,	0,	sys_sysfs,		"sysfs"			}, /* 135 */
 	{ 1,	0,	sys_personality,	"personality"		}, /* 136 */
 	{ 5,	0,	sys_afs_syscall,	"afs_syscall"		}, /* 137 */
-	{ 1,	0,	sys_setfsuid,		"setfsuid"		}, /* 138 */
-	{ 1,	0,	sys_setfsgid,		"setfsgid"		}, /* 139 */
+	{ 1,	NF,	sys_setfsuid,		"setfsuid"		}, /* 138 */
+	{ 1,	NF,	sys_setfsgid,		"setfsgid"		}, /* 139 */
 	{ 5,	TF,	sys_llseek,		"_llseek"		}, /* 140 */
 	{ 3,	TD,	sys_getdents,		"getdents"		}, /* 141 */
 	{ 5,	TD,	sys_select,		"_newselect"		}, /* 142 */
@ -168,17 +165,17 @@
 	{ 1,	0,	sys_sched_get_priority_min,"sched_get_priority_min"}, /* 160 */
 	{ 2,	0,	sys_sched_rr_get_interval,"sched_rr_get_interval"}, /* 161 */
 	{ 2,	0,	sys_nanosleep,		"nanosleep"		}, /* 162 */
-	{ 4,	0,	sys_mremap,		"mremap"		}, /* 163 */
+	{ 5,	0,	sys_mremap,		"mremap"		}, /* 163 */
 	{ 3,	0,	sys_setresuid,		"setresuid"		}, /* 164 */
 	{ 3,	0,	sys_setresuid,		"getresuid"		}, /* 165 */
 	{ 2,	TS,	sys_sigaltstack,	"sigaltstack"		}, /* 166 */
 	{ 5,	0,	sys_query_module,	"query_module"		}, /* 167 */
 	{ 3,	TD,	sys_poll,		"poll"			}, /* 168 */
-	{ 3,	0,	printargs,		"nfsservctl"		}, /* 169 */
+	{ 3,	0,	sys_nfsservctl,		"nfsservctl"		}, /* 169 */
 	{ 3,	0,	sys_setresgid,		"setresgid"		}, /* 170 */
 	{ 3,	0,	sys_setresgid,		"getresgid"		}, /* 171 */
 	{ 5,	0,	sys_prctl,		"prctl"			}, /* 172 */
-	{ 1,	TS,	sys_sigreturn,		"rt_sigreturn"		}, /* 173 */
+	{ 0,	TS,	sys_sigreturn,		"rt_sigreturn"		}, /* 173 */
 	{ 4,	TS,	sys_rt_sigaction,	"rt_sigaction"		}, /* 174 */
 	{ 4,	TS,	sys_rt_sigprocmask,	"rt_sigprocmask"	}, /* 175 */
 	{ 2,	TS,	sys_rt_sigpending,	"rt_sigpending"		}, /* 176 */
@ -188,7 +185,7 @@
 	{ 3,	TF,	sys_chown,		"chown"			}, /* 180 */
 	{ 5,	TN,	sys_setsockopt,		"setsockopt"		}, /* 181 */
 	{ 5,	TN,	sys_getsockopt,		"getsockopt"		}, /* 182 */
-	{ 5,	TN,	sys_sendmsg,		"sendmsg"		}, /* 183 */
+	{ 3,	TN,	sys_sendmsg,		"sendmsg"		}, /* 183 */
 	{ 5,	TN,	sys_recvmsg,		"recvmsg"		}, /* 184 */
 	{ 4,	TI,	sys_semop,		"semop"			}, /* 185 */
 	{ 4,	TI,	sys_semget,		"semget"		}, /* 186 */
@ -211,7 +208,7 @@
 	{ 5,	0,	printargs,		"attrctl"		}, /* 203 */
 	{ 5,	0,	printargs,		"acl_get"		}, /* 204 */
 	{ 5,	0,	printargs,		"acl_set"		}, /* 205 */
-	{ 0,	0,	printargs,		"gettid"		}, /* 206 */
+	{ 0,	0,	sys_gettid,		"gettid"		}, /* 206 */
 	{ 4,	TD,	sys_readahead,		"readahead"		}, /* 207 */
 	{ 2,	TS,	sys_kill,		"tkill"			}, /* 208 */
 	{ 4,	TD|TN,	sys_sendfile,		"sendfile64"		}, /* 209 */
@ -228,12 +225,12 @@
 	{ 5,	0,	printargs,		"alloc_hugepages"	}, /* 220 */
 	{ 1,	0,	printargs,		"free_hugepages"	}, /* 221 */
 	{ 1,	TP,	sys_exit,		"exit_group"		}, /* 222 */
-	{ 4,	0,	printargs,		"lookup_dcookie"	}, /* 223 */
-	{ 1,	0,	sys_epoll_create,	"epoll_create"		}, /* 224 */
+	{ 4,	0,	sys_lookup_dcookie,	"lookup_dcookie"	}, /* 223 */
+	{ 1,	TD,	sys_epoll_create,	"epoll_create"		}, /* 224 */
 	{ 4,	TD,	sys_epoll_ctl,		"epoll_ctl"		}, /* 225 */
 	{ 4,	TD,	sys_epoll_wait,		"epoll_wait"		}, /* 226 */
 	{ 5,	0,	printargs,		"remap_file_pages"	}, /* 227 */
-	{ 5,    TI,     sys_semtimedop,         "semtimedop"            }, /* 228 */
+	{ 5,	TI,	sys_semtimedop,		"semtimedop"		}, /* 228 */
 	{ 5,	0,	printargs,		"mq_open"		}, /* 229 */
 	{ 5,	0,	printargs,		"mq_unlink"		}, /* 230 */
 	{ 5,	0,	printargs,		"mq_timedsend"		}, /* 231 */
@ -241,14 +238,14 @@
 	{ 5,	0,	printargs,		"mq_notify"		}, /* 233 */
 	{ 5,	0,	printargs,		"mq_getsetattr"		}, /* 234 */
 	{ 4,	0,	printargs,		"waitid"		}, /* 235 */
-	{ 5,	0,	printargs,		"fadvise64_64"		}, /* 236 */
-	{ 5,	0,	printargs,		"set_tid_address"	}, /* 237 */
+	{ 5,	TD,	printargs,		"fadvise64_64"		}, /* 236 */
+	{ 5,	0,	sys_set_tid_address,	"set_tid_address"	}, /* 237 */
 	{ 5,	TF,	sys_setxattr,		"setxattr"		}, /* 238 */
 	{ 5,	TF,	sys_setxattr,		"lsetxattr"		}, /* 239 */
 	{ 5,	TD,	sys_fsetxattr,		"fsetxattr"		}, /* 240 */
 	{ 4,	TF,	sys_getxattr,		"getxattr"		}, /* 241 */
 	{ 4,	TF,	sys_getxattr,		"lgetxattr"		}, /* 242 */
-	{ 4,	0,	sys_fgetxattr,		"fgetxattr"		}, /* 243 */
+	{ 4,	TD,	sys_fgetxattr,		"fgetxattr"		}, /* 243 */
 	{ 5,	TF,	sys_listxattr,		"listxattr"		}, /* 244 */
 	{ 5,	TF,	sys_listxattr,		"llistxattr"		}, /* 245 */
 	{ 5,	0,	sys_flistxattr,		"flistxattr"		}, /* 246 */
@ -264,20 +261,20 @@
 	{ 2,	0,	sys_clock_gettime,	"clock_gettime"		}, /* 256 */
 	{ 2,	0,	sys_clock_getres,	"clock_getres"		}, /* 257 */
 	{ 5,	0,	printargs,		"clock_nanosleep"	}, /* 258 */
-	{ 5,	0,	printargs,		"tgkill"		}, /* 259 */
+	{ 3,	TS,	sys_tgkill,		"tgkill"		}, /* 259 */
 	{ 5,	0,	printargs,		"mbind"			}, /* 260 */
 	{ 5,	0,	printargs,		"get_mempolicy"		}, /* 261 */
 	{ 5,	0,	printargs,		"set_mempolicy"		}, /* 262 */
-	{ 5,	0,	printargs,		"vserver"		}, /* 263 */
-	{ 5,	0,	printargs,		"add_key"		}, /* 264 */
-	{ 4,	0,	printargs,		"request_key"		}, /* 265 */
-	{ 5,	0,	printargs,		"keyctl"		}, /* 266 */
-	{ 3,	0,	printargs,		"ioprio_set"		}, /* 267 */
-	{ 2,	0,	printargs,		"ioprio_get"		}, /* 268 */
-	{ 0,	TD,	printargs,		"inotify_init"		}, /* 269 */
+	{ 5,	0,	sys_vserver,		"vserver"		}, /* 263 */
+	{ 5,	0,	sys_add_key,		"add_key"		}, /* 264 */
+	{ 4,	0,	sys_request_key,	"request_key"		}, /* 265 */
+	{ 5,	0,	sys_keyctl,		"keyctl"		}, /* 266 */
+	{ 3,	0,	sys_ioprio_set,		"ioprio_set"		}, /* 267 */
+	{ 2,	0,	sys_ioprio_get,		"ioprio_get"		}, /* 268 */
+	{ 0,	TD,	sys_inotify_init,	"inotify_init"		}, /* 269 */
 	{ 3,	TD,	sys_inotify_add_watch,	"inotify_add_watch"	}, /* 270 */
 	{ 2,	TD,	sys_inotify_rm_watch,	"inotify_rm_watch"	}, /* 271 */
-	{ 4,	0,	printargs,		"migrate_pages"		}, /* 272 */
+	{ 4,	0,	sys_migrate_pages,	"migrate_pages"		}, /* 272 */
 	{ 6,	TD,	sys_pselect6,		"pselect6"		}, /* 273 */
 	{ 5,	TD,	sys_ppoll,		"ppoll"			}, /* 274 */
 	{ 4,	TD|TF,	sys_openat,		"openat"		}, /* 275 */
@ -285,7 +282,7 @@
 	{ 4,	TD|TF,	sys_mknodat,		"mknodat"		}, /* 277 */
 	{ 5,	TD|TF,	sys_fchownat,		"fchownat"		}, /* 278 */
 	{ 3,	TD|TF,	sys_futimesat,		"futimesat"		}, /* 279 */
-	{ 4,	TD|TD,	sys_newfstatat,		"newfstatat"		}, /* 280 */
+	{ 4,	TD|TF,	sys_newfstatat,		"newfstatat"		}, /* 280 */
 	{ 3,	TD|TF,	sys_unlinkat,		"unlinkat"		}, /* 281 */
 	{ 4,	TD|TF,	sys_renameat,		"renameat"		}, /* 282 */
 	{ 5,	TD|TF,	sys_linkat,		"linkat"		}, /* 283 */
@ -294,33 +291,44 @@
 	{ 3,	TD|TF,	sys_fchmodat,		"fchmodat"		}, /* 286 */
 	{ 3,	TD|TF,	sys_faccessat,		"faccessat"		}, /* 287 */
 	{ 1,	TP,	sys_unshare,		"unshare"		}, /* 288 */
-	{ 2,	0,	printargs,		"set_robust_list"	}, /* 289 */
-	{ 3,	0,	printargs,		"get_robust_list"	}, /* 290 */
-	{ 6,	TD,	printargs,		"splice"		}, /* 291 */
-	{ 4,	TD,	printargs,		"sync_file_range"	}, /* 292 */
-	{ 4,	TD,	printargs,		"tee"			}, /* 293 */
-	{ 4,	TD,	printargs,		"vmsplice"		}, /* 294 */
+	{ 2,	0,	sys_set_robust_list,	"set_robust_list"	}, /* 289 */
+	{ 3,	0,	sys_get_robust_list,	"get_robust_list"	}, /* 290 */
+	{ 6,	TD,	sys_splice,		"splice"		}, /* 291 */
+	{ 4,	TD,	sys_sync_file_range,	"sync_file_range"	}, /* 292 */
+	{ 4,	TD,	sys_tee,		"tee"			}, /* 293 */
+	{ 4,	TD,	sys_vmsplice,		"vmsplice"		}, /* 294 */
 	{ 6,	0,	sys_move_pages,		"move_pages"		}, /* 295 */
 	{ 3,	0,	sys_getcpu,		"getcpu"		}, /* 296 */
 	{ 6,	TD,	sys_epoll_pwait,	"epoll_pwait"		}, /* 297 */
 	{ 3,	TF,	sys_statfs64,		"statfs64"		}, /* 298 */
 	{ 3,	TD,	sys_fstatfs64,		"fstatfs64"		}, /* 299 */
-	{ 4,	0,	printargs,		"kexec_load"		}, /* 300 */
+	{ 4,	0,	sys_kexec_load,		"kexec_load"		}, /* 300 */
 	{ 4,	TD|TF,	sys_utimensat,		"utimensat"		}, /* 301 */
 	{ 3,	TD,	printargs,		"signalfd"		}, /* 302 */
 	{ 4,	TD,	printargs,		"timerfd"		}, /* 303 */
 	{ 1,	TD,	sys_eventfd,		"eventfd"		}, /* 304 */
-	{ 6,	TF,	sys_fallocate,		"fallocate"		}, /* 305 */
+	{ 6,	TD,	sys_fallocate,		"fallocate"		}, /* 305 */
 	{ 2,	TD,	sys_timerfd_create,	"timerfd_create"	}, /* 306 */
 	{ 4,	TD,	sys_timerfd_settime,	"timerfd_settime"	}, /* 307 */
 	{ 2,	TD,	sys_timerfd_gettime,	"timerfd_gettime"	}, /* 308 */
-	{ 4,	TD|TS,	printargs,		"signalfd4"		}, /* 309 */
-	{ 2,	TD,	printargs,		"eventfd2"		}, /* 310 */
-	{ 1,	0,	printargs,		"epoll_create1"		}, /* 311 */
-	{ 3,	TD,	printargs,		"dup3"			}, /* 312 */
-	{ 2,	TD,	printargs,		"pipe2"			}, /* 313 */
-	{ 1,	TD,	printargs,		"inotify_init1"		}, /* 314 */
-	{ 5,	TD,	printargs,		"preadv"		}, /* 315 */
-	{ 5,	TD,	printargs,		"pwritev"		}, /* 316 */
-	{ 4,	TP|TS,	printargs,		"rt_tgsigqueueinfo"	}, /* 317 */
-	{ 5,	0,	printargs,		"perf_counter_open"	}, /* 318 */
+	{ 4,	TD|TS,	sys_signalfd4,		"signalfd4"		}, /* 309 */
+	{ 2,	TD,	sys_eventfd2,		"eventfd2"		}, /* 310 */
+	{ 1,	TD,	sys_epoll_create1,	"epoll_create1"		}, /* 311 */
+	{ 3,	TD,	sys_dup3,		"dup3"			}, /* 312 */
+	{ 2,	TD,	sys_pipe2,		"pipe2"			}, /* 313 */
+	{ 1,	TD,	sys_inotify_init1,	"inotify_init1"		}, /* 314 */
+	{ 5,	TD,	sys_preadv,		"preadv"		}, /* 315 */
+	{ 5,	TD,	sys_pwritev,		"pwritev"		}, /* 316 */
+	{ 4,	TP|TS,	sys_rt_tgsigqueueinfo,	"rt_tgsigqueueinfo"	}, /* 317 */
+	{ 5,	TD,	sys_perf_event_open,	"perf_event_open"	}, /* 318 */
+	{ 5,	TN,	sys_recvmmsg,		"recvmmsg"		}, /* 319 */
+	{ 4,	TN,	sys_accept4,		"accept4"		}, /* 320 */
+	{ 4,	0,	sys_prlimit64,		"prlimit64"		}, /* 321 */
+	{ 2,	TD,	sys_fanotify_init,	"fanotify_init"		}, /* 322 */
+	{ 5,	TD|TF,	sys_fanotify_mark,	"fanotify_mark"		}, /* 323 */
+	{ 2,	0,	sys_clock_adjtime,	"clock_adjtime"		}, /* 324 */
+	{ 5,	TD|TF,	sys_name_to_handle_at,	"name_to_handle_at"	}, /* 325 */
+	{ 3,	TD,	sys_open_by_handle_at,	"open_by_handle_at"	}, /* 326 */
+	{ 1,	TD,	sys_syncfs,		"syncfs"		}, /* 327 */
+	{ 2,	TD,	sys_setns,		"setns"			}, /* 328 */
+	{ 4,	TN,	sys_sendmmsg,		"sendmmsg"		}, /* 329 */
--- a/linux/i386/ioctlent.h.in
+++ b/linux/i386/ioctlent.h.in
@ -0,0 +1,92 @@
+	{"asm/mtrr.h",	"MTRRIOC_ADD_ENTRY",	0x4d00},
+	{"asm/mce.h",	"MCE_GET_RECORD_LEN",	0x4d01},
+	{"asm/mtrr.h",	"MTRRIOC_SET_ENTRY",	0x4d01},
+	{"asm/mce.h",	"MCE_GET_LOG_LEN",	0x4d02},
+	{"asm/mtrr.h",	"MTRRIOC_DEL_ENTRY",	0x4d02},
+	{"asm/mce.h",	"MCE_GETCLEAR_FLAGS",	0x4d03},
+	{"asm/mtrr.h",	"MTRRIOC_GET_ENTRY",	0x4d03},
+	{"asm/mtrr.h",	"MTRRIOC_KILL_ENTRY",	0x4d04},
+	{"asm/mtrr.h",	"MTRRIOC_ADD_PAGE_ENTRY",	0x4d05},
+	{"asm/mtrr.h",	"MTRRIOC_SET_PAGE_ENTRY",	0x4d06},
+	{"asm/mtrr.h",	"MTRRIOC_DEL_PAGE_ENTRY",	0x4d07},
+	{"asm/mtrr.h",	"MTRRIOC_GET_PAGE_ENTRY",	0x4d08},
+	{"asm/mtrr.h",	"MTRRIOC_KILL_PAGE_ENTRY",	0x4d09},
+	{"asm-generic/ioctls.h",	"TCGETS",	0x5401},
+	{"asm-generic/ioctls.h",	"TCSETS",	0x5402},
+	{"asm-generic/ioctls.h",	"TCSETSW",	0x5403},
+	{"asm-generic/ioctls.h",	"TCSETSF",	0x5404},
+	{"asm-generic/ioctls.h",	"TCGETA",	0x5405},
+	{"asm-generic/ioctls.h",	"TCSETA",	0x5406},
+	{"asm-generic/ioctls.h",	"TCSETAW",	0x5407},
+	{"asm-generic/ioctls.h",	"TCSETAF",	0x5408},
+	{"asm-generic/ioctls.h",	"TCSBRK",	0x5409},
+	{"asm-generic/ioctls.h",	"TCXONC",	0x540a},
+	{"asm-generic/ioctls.h",	"TCFLSH",	0x540b},
+	{"asm-generic/ioctls.h",	"TIOCEXCL",	0x540c},
+	{"asm-generic/ioctls.h",	"TIOCNXCL",	0x540d},
+	{"asm-generic/ioctls.h",	"TIOCSCTTY",	0x540e},
+	{"asm-generic/ioctls.h",	"TIOCGPGRP",	0x540f},
+	{"asm-generic/ioctls.h",	"TIOCSPGRP",	0x5410},
+	{"asm-generic/ioctls.h",	"TIOCOUTQ",	0x5411},
+	{"asm-generic/ioctls.h",	"TIOCSTI",	0x5412},
+	{"asm-generic/ioctls.h",	"TIOCGWINSZ",	0x5413},
+	{"asm-generic/ioctls.h",	"TIOCSWINSZ",	0x5414},
+	{"asm-generic/ioctls.h",	"TIOCMGET",	0x5415},
+	{"asm-generic/ioctls.h",	"TIOCMBIS",	0x5416},
+	{"asm-generic/ioctls.h",	"TIOCMBIC",	0x5417},
+	{"asm-generic/ioctls.h",	"TIOCMSET",	0x5418},
+	{"asm-generic/ioctls.h",	"TIOCGSOFTCAR",	0x5419},
+	{"asm-generic/ioctls.h",	"TIOCSSOFTCAR",	0x541a},
+	{"asm-generic/ioctls.h",	"FIONREAD",	0x541b},
+	{"asm-generic/ioctls.h",	"TIOCLINUX",	0x541c},
+	{"asm-generic/ioctls.h",	"TIOCCONS",	0x541d},
+	{"asm-generic/ioctls.h",	"TIOCGSERIAL",	0x541e},
+	{"asm-generic/ioctls.h",	"TIOCSSERIAL",	0x541f},
+	{"asm-generic/ioctls.h",	"TIOCPKT",	0x5420},
+	{"asm-generic/ioctls.h",	"FIONBIO",	0x5421},
+	{"asm-generic/ioctls.h",	"TIOCNOTTY",	0x5422},
+	{"asm-generic/ioctls.h",	"TIOCSETD",	0x5423},
+	{"asm-generic/ioctls.h",	"TIOCGETD",	0x5424},
+	{"asm-generic/ioctls.h",	"TCSBRKP",	0x5425},
+	{"asm-generic/ioctls.h",	"TIOCSBRK",	0x5427},
+	{"asm-generic/ioctls.h",	"TIOCCBRK",	0x5428},
+	{"asm-generic/ioctls.h",	"TIOCGSID",	0x5429},
+	{"asm-generic/ioctls.h",	"TCGETS2",	0x542a},
+	{"asm-generic/ioctls.h",	"TCSETS2",	0x542b},
+	{"asm-generic/ioctls.h",	"TCSETSW2",	0x542c},
+	{"asm-generic/ioctls.h",	"TCSETSF2",	0x542d},
+	{"asm-generic/ioctls.h",	"TIOCGRS485",	0x542e},
+	{"asm-generic/ioctls.h",	"TIOCSRS485",	0x542f},
+	{"asm-generic/ioctls.h",	"TIOCGPTN",	0x5430},
+	{"asm-generic/ioctls.h",	"TIOCSPTLCK",	0x5431},
+	{"asm-generic/ioctls.h",	"TCGETX",	0x5432},
+	{"asm-generic/ioctls.h",	"TIOCGDEV",	0x5432},
+	{"asm-generic/ioctls.h",	"TCSETX",	0x5433},
+	{"asm-generic/ioctls.h",	"TCSETXF",	0x5434},
+	{"asm-generic/ioctls.h",	"TCSETXW",	0x5435},
+	{"asm-generic/ioctls.h",	"TIOCSIG",	0x5436},
+	{"asm-generic/ioctls.h",	"TIOCVHANGUP",	0x5437},
+	{"asm-generic/ioctls.h",	"FIONCLEX",	0x5450},
+	{"asm-generic/ioctls.h",	"FIOCLEX",	0x5451},
+	{"asm-generic/ioctls.h",	"FIOASYNC",	0x5452},
+	{"asm-generic/ioctls.h",	"TIOCSERCONFIG",	0x5453},
+	{"asm-generic/ioctls.h",	"TIOCSERGWILD",	0x5454},
+	{"asm-generic/ioctls.h",	"TIOCSERSWILD",	0x5455},
+	{"asm-generic/ioctls.h",	"TIOCGLCKTRMIOS",	0x5456},
+	{"asm-generic/ioctls.h",	"TIOCSLCKTRMIOS",	0x5457},
+	{"asm-generic/ioctls.h",	"TIOCSERGSTRUCT",	0x5458},
+	{"asm-generic/ioctls.h",	"TIOCSERGETLSR",	0x5459},
+	{"asm-generic/ioctls.h",	"TIOCSERGETMULTI",	0x545a},
+	{"asm-generic/ioctls.h",	"TIOCSERSETMULTI",	0x545b},
+	{"asm-generic/ioctls.h",	"TIOCMIWAIT",	0x545c},
+	{"asm-generic/ioctls.h",	"TIOCGICOUNT",	0x545d},
+	{"asm-generic/ioctls.h",	"FIOQSIZE",	0x5460},
+	{"asm/msr.h",	"X86_IOC_RDMSR_REGS",	0x63a0},
+	{"asm/msr.h",	"X86_IOC_WRMSR_REGS",	0x63a1},
+	{"asm-generic/sockios.h",	"FIOSETOWN",	0x8901},
+	{"asm-generic/sockios.h",	"SIOCSPGRP",	0x8902},
+	{"asm-generic/sockios.h",	"FIOGETOWN",	0x8903},
+	{"asm-generic/sockios.h",	"SIOCGPGRP",	0x8904},
+	{"asm-generic/sockios.h",	"SIOCATMARK",	0x8905},
+	{"asm-generic/sockios.h",	"SIOCGSTAMP",	0x8906},
+	{"asm-generic/sockios.h",	"SIOCGSTAMPNS",	0x8907},
--- a/linux/i386/syscallent.h
+++ b/linux/i386/syscallent.h
@ -24,22 +24,20 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id$
 */

 	{ 0,	0,	sys_restart_syscall,	"restart_syscall" }, /* 0 */
-	{ 1,	TP,	sys_exit,		"_exit", SYS_exit }, /* 1 */
-	{ 0,	TP,	sys_fork,		"fork", SYS_fork }, /* 2 */
-	{ 3,	TD,	sys_read,		"read", SYS_read }, /* 3 */
-	{ 3,	TD,	sys_write,		"write", SYS_write }, /* 4 */
+	{ 1,	TP,	sys_exit,		"_exit",	}, /* 1 */
+	{ 0,	TP,	sys_fork,		"fork",		}, /* 2 */
+	{ 3,	TD,	sys_read,		"read",		}, /* 3 */
+	{ 3,	TD,	sys_write,		"write",	}, /* 4 */
 	{ 3,	TD|TF,	sys_open,		"open"		}, /* 5 */
 	{ 1,	TD,	sys_close,		"close"		}, /* 6 */
-	{ 3,	TP,	sys_waitpid,		"waitpid", SYS_wait4 }, /* 7 */
+	{ 3,	TP,	sys_waitpid,		"waitpid",	}, /* 7 */
 	{ 2,	TD|TF,	sys_creat,		"creat"		}, /* 8 */
 	{ 2,	TF,	sys_link,		"link"		}, /* 9 */
 	{ 1,	TF,	sys_unlink,		"unlink"	}, /* 10 */
-	{ 3,	TF|TP,	sys_execve,		"execve", SYS_execve }, /* 11 */
+	{ 3,	TF|TP,	sys_execve,		"execve"	}, /* 11 */
 	{ 1,	TF,	sys_chdir,		"chdir"		}, /* 12 */
 	{ 1,	0,	sys_time,		"time"		}, /* 13 */
 	{ 3,	TF,	sys_mknod,		"mknod"		}, /* 14 */
@ -52,7 +50,7 @@
 	{ 5,	TF,	sys_mount,		"mount"		}, /* 21 */
 	{ 1,	TF,	sys_umount,		"oldumount"	}, /* 22 */
 	{ 1,	0,	sys_setuid,		"setuid"	}, /* 23 */
-	{ 0,	0,	sys_getuid,		"getuid"	}, /* 24 */
+	{ 0,	NF,	sys_getuid,		"getuid"	}, /* 24 */
 	{ 1,	0,	sys_stime,		"stime"		}, /* 25 */
 	{ 4,	0,	sys_ptrace,		"ptrace"	}, /* 26 */
 	{ 1,	0,	sys_alarm,		"alarm"		}, /* 27 */
@ -75,10 +73,10 @@
 	{ 0,	0,	sys_prof,		"prof"		}, /* 44 */
 	{ 1,	0,	sys_brk,		"brk"		}, /* 45 */
 	{ 1,	0,	sys_setgid,		"setgid"	}, /* 46 */
-	{ 0,	0,	sys_getgid,		"getgid"	}, /* 47 */
+	{ 0,	NF,	sys_getgid,		"getgid"	}, /* 47 */
 	{ 3,	TS,	sys_signal,		"signal"	}, /* 48 */
-	{ 0,	0,	sys_geteuid,		"geteuid"	}, /* 49 */
-	{ 0,	0,	sys_getegid,		"getegid"	}, /* 50 */
+	{ 0,	NF,	sys_geteuid,		"geteuid"	}, /* 49 */
+	{ 0,	NF,	sys_getegid,		"getegid"	}, /* 50 */
 	{ 1,	TF,	sys_acct,		"acct"		}, /* 51 */
 	{ 2,	TF,	sys_umount2,		"umount"	}, /* 52 */
 	{ 0,	0,	sys_lock,		"lock"		}, /* 53 */
@ -96,8 +94,8 @@
 	{ 0,	0,	sys_getpgrp,		"getpgrp"	}, /* 65 */
 	{ 0,	0,	sys_setsid,		"setsid"	}, /* 66 */
 	{ 3,	TS,	sys_sigaction,		"sigaction"	}, /* 67 */
-	{ 0,	TS,	sys_siggetmask,		"siggetmask"	}, /* 68 */
-	{ 1,	TS,	sys_sigsetmask,		"sigsetmask"	}, /* 69 */
+	{ 0,	TS,	sys_siggetmask,		"sgetmask"	}, /* 68 */
+	{ 1,	TS,	sys_sigsetmask,		"ssetmask"	}, /* 69 */
 	{ 2,	0,	sys_setreuid,		"setreuid"	}, /* 70 */
 	{ 2,	0,	sys_setregid,		"setregid"	}, /* 71 */
 	{ 3,	TS,	sys_sigsuspend,		"sigsuspend"	}, /* 72 */
@ -115,8 +113,8 @@
 	{ 2,	TF,	sys_oldlstat,		"oldlstat"	}, /* 84 */
 	{ 3,	TF,	sys_readlink,		"readlink"	}, /* 85 */
 	{ 1,	TF,	sys_uselib,		"uselib"	}, /* 86 */
-	{ 1,	TF,	sys_swapon,		"swapon"	}, /* 87 */
-	{ 3,	0,	sys_reboot,		"reboot"	}, /* 88 */
+	{ 2,	TF,	sys_swapon,		"swapon"	}, /* 87 */
+	{ 4,	0,	sys_reboot,		"reboot"	}, /* 88 */
 	{ 3,	TD,	sys_readdir,		"readdir"	}, /* 89 */
 	{ 6,	TD,	sys_old_mmap,		"old_mmap"	}, /* 90 */
 	{ 2,	0,	sys_munmap,		"munmap"	}, /* 91 */
@ -130,7 +128,7 @@
 	{ 2,	TF,	sys_statfs,		"statfs"	}, /* 99 */
 	{ 2,	TD,	sys_fstatfs,		"fstatfs"	}, /* 100 */
 	{ 3,	0,	sys_ioperm,		"ioperm"	}, /* 101 */
-	{ 2,	TD,	sys_socketcall,		"socketcall", SYS_socketcall }, /* 102 */
+	{ 2,	TD,	sys_socketcall,		"socketcall"	}, /* 102 */
 	{ 3,	0,	sys_syslog,		"syslog"	}, /* 103 */
 	{ 3,	0,	sys_setitimer,		"setitimer"	}, /* 104 */
 	{ 2,	0,	sys_getitimer,		"getitimer"	}, /* 105 */
@ -142,13 +140,13 @@
 	{ 0,	0,	sys_vhangup,		"vhangup"	}, /* 111 */
 	{ 0,	0,	sys_idle,		"idle"		}, /* 112 */
 	{ 1,	0,	sys_vm86old,		"vm86old"	}, /* 113 */
-	{ 4,	TP,	sys_wait4,		"wait4", SYS_wait4 }, /* 114 */
-	{ 1,	0,	sys_swapoff,		"swapoff"	}, /* 115 */
+	{ 4,	TP,	sys_wait4,		"wait4",	}, /* 114 */
+	{ 1,	TF,	sys_swapoff,		"swapoff"	}, /* 115 */
 	{ 1,	0,	sys_sysinfo,		"sysinfo"	}, /* 116 */
-	{ 6,	0,	sys_ipc,		"ipc", SYS_ipc }, /* 117 */
+	{ 6,	TI,	sys_ipc,		"ipc",		}, /* 117 */
 	{ 1,	TD,	sys_fsync,		"fsync"		}, /* 118 */
-	{ 1,	TS,	sys_sigreturn,		"sigreturn"	}, /* 119 */
-	{ 5,	TP,	sys_clone,		"clone", SYS_clone }, /* 120 */
+	{ 0,	TS,	sys_sigreturn,		"sigreturn"	}, /* 119 */
+	{ 5,	TP,	sys_clone,		"clone"		}, /* 120 */
 	{ 2,	0,	sys_setdomainname,	"setdomainname"	}, /* 121 */
 	{ 1,	0,	sys_uname,		"uname"		}, /* 122 */
 	{ 3,	0,	sys_modify_ldt,		"modify_ldt"	}, /* 123 */
@ -163,24 +161,24 @@
 	{ 1,	0,	sys_getpgid,		"getpgid"	}, /* 132 */
 	{ 1,	TD,	sys_fchdir,		"fchdir"	}, /* 133 */
 	{ 0,	0,	sys_bdflush,		"bdflush"	}, /* 134 */
-	{ 3,	0,	sys_sysfs,		"sysfs", SYS_sysfs }, /* 135 */
+	{ 3,	0,	sys_sysfs,		"sysfs",	}, /* 135 */
 	{ 1,	0,	sys_personality,	"personality"	}, /* 136 */
 	{ 5,	0,	sys_afs_syscall,	"afs_syscall"	}, /* 137 */
-	{ 1,	0,	sys_setfsuid,		"setfsuid"	}, /* 138 */
-	{ 1,	0,	sys_setfsgid,		"setfsgid"	}, /* 139 */
+	{ 1,	NF,	sys_setfsuid,		"setfsuid"	}, /* 138 */
+	{ 1,	NF,	sys_setfsgid,		"setfsgid"	}, /* 139 */
 	{ 5,	TD,	sys_llseek,		"_llseek"	}, /* 140 */
 	{ 3,	TD,	sys_getdents,		"getdents"	}, /* 141 */
 	{ 5,	TD,	sys_select,		"select"	}, /* 142 */
 	{ 2,	TD,	sys_flock,		"flock"		}, /* 143 */
 	{ 3,	0,	sys_msync,		"msync"		}, /* 144 */
-	{ 3,	TD,	sys_readv,		"readv", SYS_readv }, /* 145 */
-	{ 3,	TD,	sys_writev,		"writev", SYS_writev }, /* 146 */
+	{ 3,	TD,	sys_readv,		"readv",	}, /* 145 */
+	{ 3,	TD,	sys_writev,		"writev",	}, /* 146 */
 	{ 1,	0,	sys_getsid,		"getsid"	}, /* 147 */
 	{ 1,	TD,	sys_fdatasync,		"fdatasync"	}, /* 148 */
 	{ 1,	0,	sys_sysctl,		"_sysctl"	}, /* 149 */
 	{ 2,	0,	sys_mlock,		"mlock"		}, /* 150 */
 	{ 2,	0,	sys_munlock,		"munlock"	}, /* 151 */
-	{ 2,	0,	sys_mlockall,		"mlockall"	}, /* 152 */
+	{ 1,	0,	sys_mlockall,		"mlockall"	}, /* 152 */
 	{ 0,	0,	sys_munlockall,		"munlockall"	}, /* 153 */
 	{ 0,	0,	sys_sched_setparam,	"sched_setparam"}, /* 154 */
 	{ 2,	0,	sys_sched_getparam,	"sched_getparam"}, /* 155 */
@ -191,26 +189,26 @@
 	{ 1,	0,	sys_sched_get_priority_min,"sched_get_priority_min"}, /* 160 */
 	{ 2,	0,	sys_sched_rr_get_interval,"sched_rr_get_interval"}, /* 161 */
 	{ 2,	0,	sys_nanosleep,		"nanosleep"	}, /* 162 */
-	{ 4,	0,	sys_mremap,		"mremap"	}, /* 163 */
+	{ 5,	0,	sys_mremap,		"mremap"	}, /* 163 */
 	{ 3,	0,	sys_setresuid,		"setresuid"	}, /* 164 */
 	{ 3,	0,	sys_getresuid,		"getresuid"	}, /* 165 */
-	{ 5,	0,	printargs,		"vm86"		}, /* 166 */
+	{ 5,	0,	sys_vm86,		"vm86"		}, /* 166 */
 	{ 5,	0,	sys_query_module,	"query_module"	}, /* 167 */
 	{ 3,	TD,	sys_poll,		"poll"		}, /* 168 */
-	{ 3,	0,	printargs,		"nfsservctl"	}, /* 169 */
+	{ 3,	0,	sys_nfsservctl,		"nfsservctl"	}, /* 169 */
 	{ 3,	0,	sys_setresgid,		"setresgid"	}, /* 170 */
 	{ 3,	0,	sys_getresgid,		"getresgid"	}, /* 171 */
 	{ 5,	0,	sys_prctl,		"prctl"		}, /* 172 */
-	{ 1,	TS,	printargs,		"rt_sigreturn"	}, /* 173 */
-	{ 4,	TS,	sys_rt_sigaction,	"rt_sigaction"  }, /* 174 */
+	{ 0,	TS,	sys_rt_sigreturn,	"rt_sigreturn"	}, /* 173 */
+	{ 4,	TS,	sys_rt_sigaction,	"rt_sigaction"	}, /* 174 */
 	{ 4,	TS,	sys_rt_sigprocmask,	"rt_sigprocmask"}, /* 175 */
 	{ 2,	TS,	sys_rt_sigpending,	"rt_sigpending"	}, /* 176 */
 	{ 4,	TS,	sys_rt_sigtimedwait,	"rt_sigtimedwait"}, /* 177 */
 	{ 3,	TS,	sys_rt_sigqueueinfo,    "rt_sigqueueinfo"}, /* 178 */
 	{ 2,	TS,	sys_rt_sigsuspend,	"rt_sigsuspend"	}, /* 179 */

-	{ 5,	TD,	sys_pread,		"pread64", SYS_read }, /* 180 */
-	{ 5,	TD,	sys_pwrite,		"pwrite64", SYS_write }, /* 181 */
+	{ 5,	TD,	sys_pread,		"pread64",	}, /* 180 */
+	{ 5,	TD,	sys_pwrite,		"pwrite64",	}, /* 181 */
 	{ 3,	TF,	sys_chown,		"chown"		}, /* 182 */
 	{ 2,	TF,	sys_getcwd,		"getcwd"	}, /* 183 */
 	{ 2,	0,	sys_capget,		"capget"	}, /* 184 */
@ -219,20 +217,20 @@
 	{ 4,	TD|TN,	sys_sendfile,		"sendfile"	}, /* 187 */
 	{ 5,	0,	sys_getpmsg,		"getpmsg"	}, /* 188 */
 	{ 5,	0,	sys_putpmsg,		"putpmsg"	}, /* 189 */
-	{ 0,	TP,	sys_vfork,		"vfork", SYS_vfork }, /* 190 */
+	{ 0,	TP,	sys_vfork,		"vfork"		}, /* 190 */
 	{ 2,	0,	sys_getrlimit,		"getrlimit"	}, /* 191 */
-	{ 6,	0,	sys_mmap,		"mmap2"		}, /* 192 */
+	{ 6,	TD,	sys_mmap,		"mmap2"		}, /* 192 */
 	{ 3,	TF,	sys_truncate64,		"truncate64"	}, /* 193 */
 	{ 3,	TD,	sys_ftruncate64,	"ftruncate64"	}, /* 194 */
 	{ 2,	TF,	sys_stat64,		"stat64"	}, /* 195 */
 	{ 2,	TF,	sys_lstat64,		"lstat64"	}, /* 196 */
 	{ 2,	TD,	sys_fstat64,		"fstat64"	}, /* 197 */
 	{ 3,	TF,	sys_chown,		"lchown32"	}, /* 198 */
-	{ 0,	0,	sys_getuid,		"getuid32"	}, /* 199 */
+	{ 0,	NF,	sys_getuid,		"getuid32"	}, /* 199 */

-	{ 0,	0,	sys_getgid,		"getgid32"	}, /* 200 */
-	{ 0,	0,	sys_geteuid,		"geteuid32"	}, /* 201 */
-	{ 0,	0,	sys_getegid,		"getegid32"	}, /* 202 */
+	{ 0,	NF,	sys_getgid,		"getgid32"	}, /* 200 */
+	{ 0,	NF,	sys_geteuid,		"geteuid32"	}, /* 201 */
+	{ 0,	NF,	sys_getegid,		"getegid32"	}, /* 202 */
 	{ 2,	0,	sys_setreuid,		"setreuid32"	}, /* 203 */
 	{ 2,	0,	sys_setregid,		"setregid32"	}, /* 204 */
 	{ 2,	0,	sys_getgroups32,	"getgroups32"	}, /* 205 */
@ -245,26 +243,26 @@
 	{ 3,	TF,	sys_chown,		"chown32"	}, /* 212 */
 	{ 1,	0,	sys_setuid,		"setuid32"	}, /* 213 */
 	{ 1,	0,	sys_setgid,		"setgid32"	}, /* 214 */
-	{ 1,	0,	sys_setfsuid,		"setfsuid32"	}, /* 215 */
-	{ 1,	0,	sys_setfsgid,		"setfsgid32"	}, /* 216 */
+	{ 1,	NF,	sys_setfsuid,		"setfsuid32"	}, /* 215 */
+	{ 1,	NF,	sys_setfsgid,		"setfsgid32"	}, /* 216 */
 	{ 2,	TF,	sys_pivotroot,		"pivot_root"	}, /* 217 */
 	{ 3,	0,	sys_mincore,		"mincore"	}, /* 218 */
 	{ 3,	0,	sys_madvise,		"madvise"	}, /* 219 */
 	{ 3,	TD,	sys_getdents64,		"getdents64"	}, /* 220 */
 	{ 3,	TD,	sys_fcntl,		"fcntl64"	}, /* 221 */
-	{ 4,	0,	printargs,		"SYS_222"	}, /* 222 */
-/*TODO*/{ 5,	0,	printargs,		"security"	}, /* 223 */
-	{ 0,	0,	printargs,		"gettid"	}, /* 224 */
+	{ 6,	0,	NULL,			NULL		}, /* 222 */
+	{ 5,	0,	sys_security,		"security"	}, /* 223 */
+	{ 0,	0,	sys_gettid,		"gettid"	}, /* 224 */
 	{ 4,	TD,	sys_readahead,		"readahead"	}, /* 225 */
 	{ 5,	TF,	sys_setxattr,		"setxattr"	}, /* 226 */
 	{ 5,	TF,	sys_setxattr,		"lsetxattr"	}, /* 227 */
 	{ 5,	TD,	sys_fsetxattr,		"fsetxattr"	}, /* 228 */
 	{ 4,	TF,	sys_getxattr,		"getxattr"	}, /* 229 */
 	{ 4,	TF,	sys_getxattr,		"lgetxattr"	}, /* 230 */
-	{ 4,	0,	sys_fgetxattr,		"fgetxattr"	}, /* 231 */
+	{ 4,	TD,	sys_fgetxattr,		"fgetxattr"	}, /* 231 */
 	{ 3,	TF,	sys_listxattr,		"listxattr"	}, /* 232 */
 	{ 3,	TF,	sys_listxattr,		"llistxattr"	}, /* 233 */
-	{ 3,	0,	sys_flistxattr,		"flistxattr"	}, /* 234 */
+	{ 3,	TD,	sys_flistxattr,		"flistxattr"	}, /* 234 */
 	{ 2,	TF,	sys_removexattr,	"removexattr"	}, /* 235 */
 	{ 2,	TF,	sys_removexattr,	"lremovexattr"	}, /* 236 */
 	{ 2,	TD,	sys_fremovexattr,	"fremovexattr"	}, /* 237 */
@ -280,15 +278,15 @@
 	{ 5,	0,	sys_io_getevents,	"io_getevents"	}, /* 247 */
 	{ 3,	0,	sys_io_submit,		"io_submit"	}, /* 248 */
 	{ 3,	0,	sys_io_cancel,		"io_cancel"	}, /* 249 */
-	{ 5,	0,	sys_fadvise64,		"fadvise64"	}, /* 250 */
-	{ 5,	0,	printargs,		"SYS_251"	}, /* 251 */
-	{ 1,	TP,	sys_exit,		"exit_group", __NR_exit_group }, /* 252 */
-	{ 4,	0,	printargs,		"lookup_dcookie"}, /* 253 */
-	{ 1,	0,	sys_epoll_create,	"epoll_create"	}, /* 254 */
+	{ 5,	TD,	sys_fadvise64,		"fadvise64"	}, /* 250 */
+	{ 6,	0,	NULL,			NULL		}, /* 251 */
+	{ 1,	TP,	sys_exit,		"exit_group"	}, /* 252 */
+	{ 4,	0,	sys_lookup_dcookie,	"lookup_dcookie"}, /* 253 */
+	{ 1,	TD,	sys_epoll_create,	"epoll_create"	}, /* 254 */
 	{ 4,	TD,	sys_epoll_ctl,		"epoll_ctl"	}, /* 255 */
 	{ 4,	TD,	sys_epoll_wait,		"epoll_wait"	}, /* 256 */
 	{ 5,	0,	sys_remap_file_pages,	"remap_file_pages"}, /* 257 */
-	{ 1,	0,	printargs,		"set_tid_address"}, /* 258 */
+	{ 1,	0,	sys_set_tid_address,	"set_tid_address"}, /* 258 */
 	{ 3,	0,	sys_timer_create,	"timer_create"	}, /* 259 */
 	{ 4,	0,	sys_timer_settime,	"timer_settime"	}, /* 260 */
 	{ 2,	0,	sys_timer_gettime,	"timer_gettime"	}, /* 261 */
@ -302,8 +300,8 @@
 	{ 3,	TD,	sys_fstatfs64,		"fstatfs64"	}, /* 269 */
 	{ 3,	TS,	sys_tgkill,		"tgkill"	}, /* 270 */
 	{ 2,	TF,	sys_utimes,		"utimes"	}, /* 271 */
-	{ 6,	0,	sys_fadvise64_64,	"fadvise64_64"	}, /* 272 */
-	{ 5,	0,	printargs,		"vserver"	}, /* 273 */
+	{ 6,	TD,	sys_fadvise64_64,	"fadvise64_64"	}, /* 272 */
+	{ 5,	0,	sys_vserver,		"vserver"	}, /* 273 */
 	{ 6,	0,	sys_mbind,		"mbind"		}, /* 274 */
 	{ 5,	0,	sys_get_mempolicy,	"get_mempolicy"	}, /* 275 */
 	{ 3,	0,	sys_set_mempolicy,	"set_mempolicy"	}, /* 276 */
@ -313,24 +311,24 @@
 	{ 5,	0,	sys_mq_timedreceive,	"mq_timedreceive" }, /* 280 */
 	{ 2,	0,	sys_mq_notify,		"mq_notify"	}, /* 281 */
 	{ 3,	0,	sys_mq_getsetattr,	"mq_getsetattr"	}, /* 282 */
-	{ 5,	0,	printargs,		"sys_kexec_load" }, /* 283 */
-	{ 5,	TP,	sys_waitid,		"waitid", SYS_waitid }, /* 284 */
-	{ 5,	0,	printargs,		"SYS_285"	}, /* 285 */
-	{ 5,	0,	printargs,		"add_key"	}, /* 286 */
-	{ 4,	0,	printargs,		"request_key"	}, /* 287 */
-	{ 5,	0,	printargs,		"keyctl"	}, /* 288 */
-	{ 3,	0,	printargs,		"ioprio_set"	}, /* 289 */
-	{ 2,	0,	printargs,		"ioprio_get"	}, /* 290 */
-	{ 0,	TD,	printargs,		"inotify_init"	}, /* 291 */
+	{ 4,	0,	sys_kexec_load,		"kexec_load"	}, /* 283 */
+	{ 5,	TP,	sys_waitid,		"waitid",	}, /* 284 */
+	{ 6,	0,	NULL,			NULL		}, /* 285 */
+	{ 5,	0,	sys_add_key,		"add_key"	}, /* 286 */
+	{ 4,	0,	sys_request_key,	"request_key"	}, /* 287 */
+	{ 5,	0,	sys_keyctl,		"keyctl"	}, /* 288 */
+	{ 3,	0,	sys_ioprio_set,		"ioprio_set"	}, /* 289 */
+	{ 2,	0,	sys_ioprio_get,		"ioprio_get"	}, /* 290 */
+	{ 0,	TD,	sys_inotify_init,	"inotify_init"	}, /* 291 */
 	{ 3,	TD,	sys_inotify_add_watch,	"inotify_add_watch" }, /* 292 */
 	{ 2,	TD,	sys_inotify_rm_watch,	"inotify_rm_watch" }, /* 293 */
-	{ 4,	0,	printargs,		"migrate_pages"	}, /* 294 */
+	{ 4,	0,	sys_migrate_pages,	"migrate_pages"	}, /* 294 */
 	{ 4,	TD|TF,	sys_openat,		"openat"	}, /* 295 */
 	{ 3,	TD|TF,	sys_mkdirat,		"mkdirat"	}, /* 296 */
 	{ 4,	TD|TF,	sys_mknodat,		"mknodat"	}, /* 297 */
 	{ 5,	TD|TF,	sys_fchownat,		"fchownat"	}, /* 298 */
 	{ 3,	TD|TF,	sys_futimesat,		"futimesat"	}, /* 299 */
-	{ 4,	TD|TD,	sys_newfstatat,		"fstatat64"	}, /* 300 */
+	{ 4,	TD|TF,	sys_newfstatat,		"fstatat64"	}, /* 300 */
 	{ 3,	TD|TF,	sys_unlinkat,		"unlinkat"	}, /* 301 */
 	{ 4,	TD|TF,	sys_renameat,		"renameat"	}, /* 302 */
 	{ 5,	TD|TF,	sys_linkat,		"linkat"	}, /* 303 */
@ -341,100 +339,100 @@
 	{ 6,	TD,	sys_pselect6,		"pselect6"	}, /* 308 */
 	{ 5,	TD,	sys_ppoll,		"ppoll"		}, /* 309 */
 	{ 1,	TP,	sys_unshare,		"unshare"	}, /* 310 */
-	{ 2,	0,	printargs,		"set_robust_list" }, /* 311 */
-	{ 3,	0,	printargs,		"get_robust_list" }, /* 312 */
-	{ 6,	TD,	printargs,		"splice"	}, /* 313 */
-	{ 4,	TD,	printargs,		"sync_file_range" }, /* 314 */
-	{ 4,	TD,	printargs,		"tee"		}, /* 315 */
-	{ 4,	TD,	printargs,		"vmsplice"	}, /* 316 */
+	{ 2,	0,	sys_set_robust_list,	"set_robust_list" }, /* 311 */
+	{ 3,	0,	sys_get_robust_list,	"get_robust_list" }, /* 312 */
+	{ 6,	TD,	sys_splice,		"splice"	}, /* 313 */
+	{ 4,	TD,	sys_sync_file_range,	"sync_file_range" }, /* 314 */
+	{ 4,	TD,	sys_tee,		"tee"		}, /* 315 */
+	{ 4,	TD,	sys_vmsplice,		"vmsplice"	}, /* 316 */
 	{ 6,	0,	sys_move_pages,		"move_pages"	}, /* 317 */
 	{ 3,	0,	sys_getcpu,		"getcpu"	}, /* 318 */
-	{ 5,	TD,	sys_epoll_pwait,	"epoll_pwait"	}, /* 319 */
+	{ 6,	TD,	sys_epoll_pwait,	"epoll_pwait"	}, /* 319 */
 	{ 4,	TD|TF,	sys_utimensat,		"utimensat"	}, /* 320 */
 	{ 3,	TD|TS,	sys_signalfd,		"signalfd"	}, /* 321 */
 	{ 2,	TD,	sys_timerfd_create,	"timerfd_create"}, /* 322 */
 	{ 1,	TD,	sys_eventfd,		"eventfd"	}, /* 323 */
-	{ 6,	TF,	sys_fallocate,		"fallocate"	}, /* 324 */
+	{ 6,	TD,	sys_fallocate,		"fallocate"	}, /* 324 */
 	{ 4,	TD,	sys_timerfd_settime,	"timerfd_settime"}, /* 325 */
 	{ 2,	TD,	sys_timerfd_gettime,	"timerfd_gettime"}, /* 326 */
 	{ 4,	TD|TS,	sys_signalfd4,		"signalfd4"	}, /* 327 */
 	{ 2,	TD,	sys_eventfd2,		"eventfd2"	}, /* 328 */
-	{ 1,	0,	sys_epoll_create1,	"epoll_create1"	}, /* 329 */
+	{ 1,	TD,	sys_epoll_create1,	"epoll_create1"	}, /* 329 */
 	{ 3,	TD,	sys_dup3,		"dup3"		}, /* 330 */
 	{ 2,	TD,	sys_pipe2,		"pipe2"		}, /* 331 */
-	{ 1,	TD,	printargs,		"inotify_init1"	}, /* 332 */
-	{ 5,	0,	printargs,		"SYS_333"	}, /* 333 */
-	{ 5,	0,	printargs,		"SYS_334"	}, /* 334 */
-	{ 5,	0,	printargs,		"SYS_335"	}, /* 335 */
-	{ 5,	0,	printargs,		"SYS_336"	}, /* 336 */
-	{ 5,	0,	printargs,		"SYS_337"	}, /* 337 */
-	{ 5,	0,	printargs,		"SYS_338"	}, /* 338 */
-	{ 5,	0,	printargs,		"SYS_339"	}, /* 339 */
-	{ 5,	0,	printargs,		"SYS_340"	}, /* 340 */
-	{ 5,	0,	printargs,		"SYS_341"	}, /* 341 */
-	{ 5,	0,	printargs,		"SYS_342"	}, /* 342 */
-	{ 5,	0,	printargs,		"SYS_343"	}, /* 343 */
-	{ 5,	0,	printargs,		"SYS_344"	}, /* 344 */
-	{ 5,	0,	printargs,		"SYS_345"	}, /* 345 */
-	{ 5,	0,	printargs,		"SYS_346"	}, /* 346 */
-	{ 5,	0,	printargs,		"SYS_347"	}, /* 347 */
-	{ 5,	0,	printargs,		"SYS_348"	}, /* 348 */
-	{ 5,	0,	printargs,		"SYS_349"	}, /* 349 */
-	{ 5,	0,	printargs,		"SYS_350"	}, /* 350 */
-	{ 5,	0,	printargs,		"SYS_351"	}, /* 351 */
-	{ 5,	0,	printargs,		"SYS_352"	}, /* 352 */
-	{ 5,	0,	printargs,		"SYS_353"	}, /* 353 */
-	{ 5,	0,	printargs,		"SYS_354"	}, /* 354 */
-	{ 5,	0,	printargs,		"SYS_355"	}, /* 355 */
-	{ 5,	0,	printargs,		"SYS_356"	}, /* 356 */
-	{ 5,	0,	printargs,		"SYS_357"	}, /* 357 */
-	{ 5,	0,	printargs,		"SYS_358"	}, /* 358 */
-	{ 5,	0,	printargs,		"SYS_359"	}, /* 359 */
-	{ 5,	0,	printargs,		"SYS_360"	}, /* 360 */
-	{ 5,	0,	printargs,		"SYS_361"	}, /* 361 */
-	{ 5,	0,	printargs,		"SYS_362"	}, /* 362 */
-	{ 5,	0,	printargs,		"SYS_363"	}, /* 363 */
-	{ 5,	0,	printargs,		"SYS_364"	}, /* 364 */
-	{ 5,	0,	printargs,		"SYS_365"	}, /* 365 */
-	{ 5,	0,	printargs,		"SYS_366"	}, /* 366 */
-	{ 5,	0,	printargs,		"SYS_367"	}, /* 367 */
-	{ 5,	0,	printargs,		"SYS_368"	}, /* 368 */
-	{ 5,	0,	printargs,		"SYS_369"	}, /* 369 */
-	{ 5,	0,	printargs,		"SYS_370"	}, /* 370 */
-	{ 5,	0,	printargs,		"SYS_371"	}, /* 371 */
-	{ 5,	0,	printargs,		"SYS_372"	}, /* 372 */
-	{ 5,	0,	printargs,		"SYS_373"	}, /* 373 */
-	{ 5,	0,	printargs,		"SYS_374"	}, /* 374 */
-	{ 5,	0,	printargs,		"SYS_375"	}, /* 375 */
-	{ 5,	0,	printargs,		"SYS_376"	}, /* 376 */
-	{ 5,	0,	printargs,		"SYS_377"	}, /* 377 */
-	{ 5,	0,	printargs,		"SYS_378"	}, /* 378 */
-	{ 5,	0,	printargs,		"SYS_379"	}, /* 379 */
-	{ 5,	0,	printargs,		"SYS_380"	}, /* 380 */
-	{ 5,	0,	printargs,		"SYS_381"	}, /* 381 */
-	{ 5,	0,	printargs,		"SYS_382"	}, /* 382 */
-	{ 5,	0,	printargs,		"SYS_383"	}, /* 383 */
-	{ 5,	0,	printargs,		"SYS_384"	}, /* 384 */
-	{ 5,	0,	printargs,		"SYS_385"	}, /* 385 */
-	{ 5,	0,	printargs,		"SYS_386"	}, /* 386 */
-	{ 5,	0,	printargs,		"SYS_387"	}, /* 387 */
-	{ 5,	0,	printargs,		"SYS_388"	}, /* 388 */
-	{ 5,	0,	printargs,		"SYS_389"	}, /* 389 */
-	{ 5,	0,	printargs,		"SYS_390"	}, /* 390 */
-	{ 5,	0,	printargs,		"SYS_391"	}, /* 391 */
-	{ 5,	0,	printargs,		"SYS_392"	}, /* 392 */
-	{ 5,	0,	printargs,		"SYS_393"	}, /* 393 */
-	{ 5,	0,	printargs,		"SYS_394"	}, /* 394 */
-	{ 5,	0,	printargs,		"SYS_395"	}, /* 395 */
-	{ 5,	0,	printargs,		"SYS_396"	}, /* 396 */
-	{ 5,	0,	printargs,		"SYS_397"	}, /* 397 */
-	{ 5,	0,	printargs,		"SYS_398"	}, /* 398 */
-	{ 5,	0,	printargs,		"SYS_399"	}, /* 399 */
+	{ 1,	TD,	sys_inotify_init1,	"inotify_init1"	}, /* 332 */
+	{ 5,	TD,	sys_preadv,		"preadv"	}, /* 333 */
+	{ 5,	TD,	sys_pwritev,		"pwritev"	}, /* 334 */
+	{ 4,	TP|TS,	sys_rt_tgsigqueueinfo,	"rt_tgsigqueueinfo"}, /* 335 */
+	{ 5,	TD,	sys_perf_event_open,	"perf_event_open"}, /* 336 */
+	{ 5,	TN,	sys_recvmmsg,		"recvmmsg"	}, /* 337 */
+	{ 2,	TD,	sys_fanotify_init,	"fanotify_init"	}, /* 338 */
+	{ 5,	TD|TF,	sys_fanotify_mark,	"fanotify_mark"	}, /* 339 */
+	{ 4,	0,	sys_prlimit64,		"prlimit64"	}, /* 340 */
+	{ 5,	TD|TF,	sys_name_to_handle_at,	"name_to_handle_at"}, /* 341 */
+	{ 3,	TD,	sys_open_by_handle_at,	"open_by_handle_at"}, /* 342 */
+	{ 2,	0,	sys_clock_adjtime,	"clock_adjtime"	}, /* 343 */
+	{ 1,	TD,	sys_syncfs,		"syncfs"	}, /* 344 */
+	{ 4,	TN,	sys_sendmmsg,		"sendmmsg"	}, /* 345 */
+	{ 2,	TD,	sys_setns,		"setns"		}, /* 346 */
+	{ 6,	0,	sys_process_vm_readv,	"process_vm_readv"	}, /* 347 */
+	{ 6,	0,	sys_process_vm_writev,	"process_vm_writev"	}, /* 348 */
+	{ 5,	0,	NULL,			NULL		}, /* 349 */
+	{ 5,	0,	NULL,			NULL		}, /* 350 */
+	{ 5,	0,	NULL,			NULL		}, /* 351 */
+	{ 5,	0,	NULL,			NULL		}, /* 352 */
+	{ 5,	0,	NULL,			NULL		}, /* 353 */
+	{ 5,	0,	NULL,			NULL		}, /* 354 */
+	{ 5,	0,	NULL,			NULL		}, /* 355 */
+	{ 5,	0,	NULL,			NULL		}, /* 356 */
+	{ 5,	0,	NULL,			NULL		}, /* 357 */
+	{ 5,	0,	NULL,			NULL		}, /* 358 */
+	{ 5,	0,	NULL,			NULL		}, /* 359 */
+	{ 5,	0,	NULL,			NULL		}, /* 360 */
+	{ 5,	0,	NULL,			NULL		}, /* 361 */
+	{ 5,	0,	NULL,			NULL		}, /* 362 */
+	{ 5,	0,	NULL,			NULL		}, /* 363 */
+	{ 5,	0,	NULL,			NULL		}, /* 364 */
+	{ 5,	0,	NULL,			NULL		}, /* 365 */
+	{ 5,	0,	NULL,			NULL		}, /* 366 */
+	{ 5,	0,	NULL,			NULL		}, /* 367 */
+	{ 5,	0,	NULL,			NULL		}, /* 368 */
+	{ 5,	0,	NULL,			NULL		}, /* 369 */
+	{ 5,	0,	NULL,			NULL		}, /* 370 */
+	{ 5,	0,	NULL,			NULL		}, /* 371 */
+	{ 5,	0,	NULL,			NULL		}, /* 372 */
+	{ 5,	0,	NULL,			NULL		}, /* 373 */
+	{ 5,	0,	NULL,			NULL		}, /* 374 */
+	{ 5,	0,	NULL,			NULL		}, /* 375 */
+	{ 5,	0,	NULL,			NULL		}, /* 376 */
+	{ 5,	0,	NULL,			NULL		}, /* 377 */
+	{ 5,	0,	NULL,			NULL		}, /* 378 */
+	{ 5,	0,	NULL,			NULL		}, /* 379 */
+	{ 5,	0,	NULL,			NULL		}, /* 380 */
+	{ 5,	0,	NULL,			NULL		}, /* 381 */
+	{ 5,	0,	NULL,			NULL		}, /* 382 */
+	{ 5,	0,	NULL,			NULL		}, /* 383 */
+	{ 5,	0,	NULL,			NULL		}, /* 384 */
+	{ 5,	0,	NULL,			NULL		}, /* 385 */
+	{ 5,	0,	NULL,			NULL		}, /* 386 */
+	{ 5,	0,	NULL,			NULL		}, /* 387 */
+	{ 5,	0,	NULL,			NULL		}, /* 388 */
+	{ 5,	0,	NULL,			NULL		}, /* 389 */
+	{ 5,	0,	NULL,			NULL		}, /* 390 */
+	{ 5,	0,	NULL,			NULL		}, /* 391 */
+	{ 5,	0,	NULL,			NULL		}, /* 392 */
+	{ 5,	0,	NULL,			NULL		}, /* 393 */
+	{ 5,	0,	NULL,			NULL		}, /* 394 */
+	{ 5,	0,	NULL,			NULL		}, /* 395 */
+	{ 5,	0,	NULL,			NULL		}, /* 396 */
+	{ 5,	0,	NULL,			NULL		}, /* 397 */
+	{ 5,	0,	NULL,			NULL		}, /* 398 */
+	{ 5,	0,	NULL,			NULL		}, /* 399 */

 #if SYS_socket_subcall != 400
 #error fix me
 #endif
-	{ 8,	0,	printargs,		"socket_subcall"}, /* 400 */
+	{ 6,	0,	printargs,		"socket_subcall"}, /* 400 */
 	{ 3,	TN,	sys_socket,		"socket"	}, /* 401 */
 	{ 3,	TN,	sys_bind,		"bind"		}, /* 402 */
 	{ 3,	TN,	sys_connect,		"connect"	}, /* 403 */
@ -443,42 +441,43 @@
 	{ 3,	TN,	sys_getsockname,	"getsockname"	}, /* 406 */
 	{ 3,	TN,	sys_getpeername,	"getpeername"	}, /* 407 */
 	{ 4,	TN,	sys_socketpair,		"socketpair"	}, /* 408 */
-	{ 4,	TN,	sys_send,		"send", SYS_sub_send }, /* 409 */
-	{ 4,	TN,	sys_recv,		"recv", SYS_sub_recv }, /* 410 */
-	{ 6,	TN,	sys_sendto,		"sendto", SYS_sub_sendto }, /* 411 */
-	{ 6,	TN,	sys_recvfrom,		"recvfrom", SYS_sub_recvfrom }, /* 412 */
+	{ 4,	TN,	sys_send,		"send",		}, /* 409 */
+	{ 4,	TN,	sys_recv,		"recv",		}, /* 410 */
+	{ 6,	TN,	sys_sendto,		"sendto",	}, /* 411 */
+	{ 6,	TN,	sys_recvfrom,		"recvfrom",	}, /* 412 */
 	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 413 */
 	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 414 */
 	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 415 */
-	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 416 */
+	{ 3,	TN,	sys_sendmsg,		"sendmsg"	}, /* 416 */
 	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 417 */
 	{ 4,	TN,	sys_accept4,		"accept4"	}, /* 418 */
+	{ 5,	TN,	sys_recvmmsg,		"recvmmsg"	}, /* 419 */

-#if SYS_ipc_subcall != 419
+#if SYS_ipc_subcall != 420
 #error fix me
 #endif
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 419 */
-	{ 4,	TI,	sys_semop,		"semop"		}, /* 420 */
-	{ 4,	TI,	sys_semget,		"semget"	}, /* 421 */
-	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 422 */
-	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 423 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 424 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 420 */
+	{ 4,	TI,	sys_semop,		"semop"		}, /* 421 */
+	{ 4,	TI,	sys_semget,		"semget"	}, /* 422 */
+	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 423 */
+	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 424 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 425 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 426 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 427 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 428 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 429 */
-	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 430 */
-	{ 4,	TI,	sys_msgrcv,		"msgrcv"	}, /* 431 */
-	{ 4,	TI,	sys_msgget,		"msgget"	}, /* 432 */
-	{ 4,	TI,	sys_msgctl,		"msgctl"	}, /* 433 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 434 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 430 */
+	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 431 */
+	{ 4,	TI,	sys_msgrcv,		"msgrcv"	}, /* 432 */
+	{ 4,	TI,	sys_msgget,		"msgget"	}, /* 433 */
+	{ 4,	TI,	sys_msgctl,		"msgctl"	}, /* 434 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 435 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 436 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 437 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 438 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 439 */
-	{ 4,	TI,	sys_shmat,		"shmat"		}, /* 440 */
-	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 441 */
-	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 442 */
-	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 443 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 440 */
+	{ 4,	TI,	sys_shmat,		"shmat"		}, /* 441 */
+	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 442 */
+	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 443 */
+	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 444 */
--- a/linux/ia64/.cvsignore
+++ b/linux/ia64/.cvsignore
@ -1 +0,0 @@
-Makefile
--- a/linux/ia64/ioctlent.h
+++ b/linux/ia64/ioctlent.h
--- a/linux/ia64/ioctlent.h.in
+++ b/linux/ia64/ioctlent.h.in
@ -0,0 +1,66 @@
+	{"asm/ioctls.h",	"TCGETS",	0x5401},
+	{"asm/ioctls.h",	"TCSETS",	0x5402},
+	{"asm/ioctls.h",	"TCSETSW",	0x5403},
+	{"asm/ioctls.h",	"TCSETSF",	0x5404},
+	{"asm/ioctls.h",	"TCGETA",	0x5405},
+	{"asm/ioctls.h",	"TCSETA",	0x5406},
+	{"asm/ioctls.h",	"TCSETAW",	0x5407},
+	{"asm/ioctls.h",	"TCSETAF",	0x5408},
+	{"asm/ioctls.h",	"TCSBRK",	0x5409},
+	{"asm/ioctls.h",	"TCXONC",	0x540a},
+	{"asm/ioctls.h",	"TCFLSH",	0x540b},
+	{"asm/ioctls.h",	"TIOCEXCL",	0x540c},
+	{"asm/ioctls.h",	"TIOCNXCL",	0x540d},
+	{"asm/ioctls.h",	"TIOCSCTTY",	0x540e},
+	{"asm/ioctls.h",	"TIOCGPGRP",	0x540f},
+	{"asm/ioctls.h",	"TIOCSPGRP",	0x5410},
+	{"asm/ioctls.h",	"TIOCOUTQ",	0x5411},
+	{"asm/ioctls.h",	"TIOCSTI",	0x5412},
+	{"asm/ioctls.h",	"TIOCGWINSZ",	0x5413},
+	{"asm/ioctls.h",	"TIOCSWINSZ",	0x5414},
+	{"asm/ioctls.h",	"TIOCMGET",	0x5415},
+	{"asm/ioctls.h",	"TIOCMBIS",	0x5416},
+	{"asm/ioctls.h",	"TIOCMBIC",	0x5417},
+	{"asm/ioctls.h",	"TIOCMSET",	0x5418},
+	{"asm/ioctls.h",	"TIOCGSOFTCAR",	0x5419},
+	{"asm/ioctls.h",	"TIOCSSOFTCAR",	0x541a},
+	{"asm/ioctls.h",	"FIONREAD",	0x541b},
+	{"asm/ioctls.h",	"TIOCLINUX",	0x541c},
+	{"asm/ioctls.h",	"TIOCCONS",	0x541d},
+	{"asm/ioctls.h",	"TIOCGSERIAL",	0x541e},
+	{"asm/ioctls.h",	"TIOCSSERIAL",	0x541f},
+	{"asm/ioctls.h",	"TIOCPKT",	0x5420},
+	{"asm/ioctls.h",	"FIONBIO",	0x5421},
+	{"asm/ioctls.h",	"TIOCNOTTY",	0x5422},
+	{"asm/ioctls.h",	"TIOCSETD",	0x5423},
+	{"asm/ioctls.h",	"TIOCGETD",	0x5424},
+	{"asm/ioctls.h",	"TCSBRKP",	0x5425},
+	{"asm/ioctls.h",	"TIOCTTYGSTRUCT",	0x5426},
+	{"asm/ioctls.h",	"TIOCSBRK",	0x5427},
+	{"asm/ioctls.h",	"TIOCCBRK",	0x5428},
+	{"asm/ioctls.h",	"TIOCGSID",	0x5429},
+	{"asm/ioctls.h",	"TIOCGPTN",	0x5430},
+	{"asm/ioctls.h",	"TIOCSPTLCK",	0x5431},
+	{"asm/ioctls.h",	"FIONCLEX",	0x5450},
+	{"asm/ioctls.h",	"FIOCLEX",	0x5451},
+	{"asm/ioctls.h",	"FIOASYNC",	0x5452},
+	{"asm/ioctls.h",	"TIOCSERCONFIG",	0x5453},
+	{"asm/ioctls.h",	"TIOCSERGWILD",	0x5454},
+	{"asm/ioctls.h",	"TIOCSERSWILD",	0x5455},
+	{"asm/ioctls.h",	"TIOCGLCKTRMIOS",	0x5456},
+	{"asm/ioctls.h",	"TIOCSLCKTRMIOS",	0x5457},
+	{"asm/ioctls.h",	"TIOCSERGSTRUCT",	0x5458},
+	{"asm/ioctls.h",	"TIOCSERGETLSR",	0x5459},
+	{"asm/ioctls.h",	"TIOCSERGETMULTI",	0x545a},
+	{"asm/ioctls.h",	"TIOCSERSETMULTI",	0x545b},
+	{"asm/ioctls.h",	"TIOCMIWAIT",	0x545c},
+	{"asm/ioctls.h",	"TIOCGICOUNT",	0x545d},
+	{"asm/ioctls.h",	"TIOCGHAYESESP",	0x545e},
+	{"asm/ioctls.h",	"TIOCSHAYESESP",	0x545f},
+	{"asm/ioctls.h",	"FIOQSIZE",	0x5460},
+	{"asm/sockios.h",	"FIOSETOWN",	0x8901},
+	{"asm/sockios.h",	"SIOCSPGRP",	0x8902},
+	{"asm/sockios.h",	"FIOGETOWN",	0x8903},
+	{"asm/sockios.h",	"SIOCGPGRP",	0x8904},
+	{"asm/sockios.h",	"SIOCATMARK",	0x8905},
+	{"asm/sockios.h",	"SIOCGSTAMP",	0x8906},
--- a/linux/ia64/syscallent.h
+++ b/linux/ia64/syscallent.h
--- a/linux/ioctlent.h
+++ b/linux/ioctlent.h
--- a/linux/bfin/ioctlent.h
+++ b/linux/bfin/ioctlent.h
--- a/linux/ioctlent.sh
+++ b/linux/ioctlent.sh
@ -1,5 +1,4 @@
 #! /bin/sh
-#
 # Copyright (c) 2001 Wichert Akkerman <wichert@cistron.nl>
 # All rights reserved.
 #
@ -24,9 +23,6 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-#	$Id$
-#

 # Validate arg count.
 case $# in
@ -57,17 +53,18 @@ s/^\(.*\):[[:space:]]*#[[:space:]]*define[[:space:]]*\([A-Z0-9_]*\)[[:space:]]*\
 		>> ioctls.h
 }

-
 > ioctls.h

+lookup_ioctls 03 linux/hdreg.h
 lookup_ioctls 22 scsi/sg.h
 lookup_ioctls 46 linux/fb.h
 lookup_ioctls 4B linux/kd.h
+lookup_ioctls 4C linux/loop.h
 lookup_ioctls 53 linux/cdrom.h scsi/scsi.h scsi/scsi_ioctl.h
-lookup_ioctls 54 $asm/ioctls.h
+lookup_ioctls 54 $asm/ioctls.h asm-generic/ioctls.h
 lookup_ioctls 56 linux/vt.h
 lookup_ioctls '7[12]' linux/videotext.h
-lookup_ioctls 89 $asm/sockios.h linux/sockios.h
+lookup_ioctls 89 $asm/sockios.h asm-generic/sockios.h linux/sockios.h
 lookup_ioctls 8B linux/wireless.h

 if [ -e $dir/Kbuild ]; then
@ -79,9 +76,11 @@ if [ -e $dir/Kbuild ]; then
 			grep -v '^asm-'
 		echo "$asm/* asm-generic/*"
 	)
+	# special case: some headers aren't exported directly
+	files="${files} media/* net/bluetooth/* pcmcia/*"
 else
 	# older kernel so just assume some headers
-	files="linux/* $asm/* scsi/* sound/*"
+	files="linux/* $asm/* asm-generic/* scsi/* sound/*"
 fi

 # Build the list of all ioctls
@ -98,7 +97,6 @@ regexp='^[[:space:]]*#[[:space:]]*define[[:space:]]\+[A-Z][A-Z0-9_]*[[:space:]]\
 # Sort and drop dups?
 # sort -u <ioctls.h >ioctls1.h && mv ioctls1.h ioctls.h

-
 > ioctldefs.h

 # Collect potential ioctl names. ('bases' is a bad name. Sigh)
--- a/linux/ioctlsort.c
+++ b/linux/ioctlsort.c
@ -22,30 +22,28 @@ struct ioctlent ioctls[] = {

 int nioctls = sizeof(ioctls) / sizeof(ioctls[0]);

-
 int compare(const void* a, const void* b) {
 	unsigned long code1 = ((struct ioctlent *) a)->code;
 	unsigned long code2 = ((struct ioctlent *) b)->code;
 	const char *name1 = ((struct ioctlent *) a)->name;
 	const char *name2 = ((struct ioctlent *) b)->name;
-	return (code1 > code2) ? 1 : (code1 < code2) ? -1 : strcmp (name1, name2);
+	return (code1 > code2) ? 1 : (code1 < code2) ? -1 : strcmp(name1, name2);
 }

-
 int main(int argc, char** argv) {
 	int i;

-#if defined(POWERPC) || defined(__powerpc__)			/* unspeakable kludge */
+	/* ioctl_lookup() only looks at the NR and TYPE bits atm. */
 	for (i = 0; i < nioctls; i++)
-		ioctls[i].code &= ~_IOC_DIRMASK;
-#endif
+		ioctls[i].code &= (_IOC_NRMASK << _IOC_NRSHIFT) |
+				  (_IOC_TYPEMASK << _IOC_TYPESHIFT);

 	qsort(ioctls, nioctls, sizeof(ioctls[0]), compare);
-	puts ("\t/* Generated by ioctlsort */");
+	puts("\t/* Generated by ioctlsort */");
 	for (i = 0; i < nioctls; i++)
 		if (i == 0 || ioctls[i].code != ioctls[i-1].code ||
-		    strcmp (ioctls[i].name, ioctls[i-1].name))
-			printf("\t{\"%s\",\t\"%s\",\t%#lx},\n",
+		    strcmp(ioctls[i].name, ioctls[i-1].name))
+			printf("\t{\"%s\",\t\"%s\",\t%#06lx},\n",
 				ioctls[i].header, ioctls[i].name, ioctls[i].code);

 	return 0;
--- a/linux/m68k/ioctlent.h.in
+++ b/linux/m68k/ioctlent.h.in
@ -0,0 +1 @@
+#include "../i386/ioctlent.h.in"
--- a/linux/m68k/syscallent.h
+++ b/linux/m68k/syscallent.h
@ -24,22 +24,20 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id$
 */

 	{ 0,	0,	sys_restart_syscall,	"restart_syscall" }, /* 0 */
-	{ 1,	TP,	sys_exit,		"_exit", SYS_exit }, /* 1 */
-	{ 0,	TP,	sys_fork,		"fork", SYS_fork }, /* 2 */
-	{ 3,	0,	sys_read,		"read", SYS_read }, /* 3 */
-	{ 3,	0,	sys_write,		"write", SYS_write }, /* 4 */
+	{ 1,	TP,	sys_exit,		"_exit"		}, /* 1 */
+	{ 0,	TP,	sys_fork,		"fork"		}, /* 2 */
+	{ 3,	0,	sys_read,		"read"		}, /* 3 */
+	{ 3,	0,	sys_write,		"write"		}, /* 4 */
 	{ 3,	TF,	sys_open,		"open"		}, /* 5 */
 	{ 1,	0,	sys_close,		"close"		}, /* 6 */
-	{ 3,	TP,	sys_waitpid,		"waitpid", SYS_wait4 }, /* 7 */
+	{ 3,	TP,	sys_waitpid,		"waitpid"	}, /* 7 */
 	{ 2,	TF,	sys_creat,		"creat"		}, /* 8 */
 	{ 2,	TF,	sys_link,		"link"		}, /* 9 */
 	{ 1,	TF,	sys_unlink,		"unlink"	}, /* 10 */
-	{ 3,	TF|TP,	sys_execve,		"execve", SYS_execve }, /* 11 */
+	{ 3,	TF|TP,	sys_execve,		"execve"	}, /* 11 */
 	{ 1,	TF,	sys_chdir,		"chdir"		}, /* 12 */
 	{ 1,	0,	sys_time,		"time"		}, /* 13 */
 	{ 3,	TF,	sys_mknod,		"mknod"		}, /* 14 */
@ -52,7 +50,7 @@
 	{ 5,	TF,	sys_mount,		"mount"		}, /* 21 */
 	{ 1,	TF,	sys_umount,		"oldumount"	}, /* 22 */
 	{ 1,	0,	sys_setuid,		"setuid"	}, /* 23 */
-	{ 0,	0,	sys_getuid,		"getuid"	}, /* 24 */
+	{ 0,	NF,	sys_getuid,		"getuid"	}, /* 24 */
 	{ 1,	0,	sys_stime,		"stime"		}, /* 25 */
 	{ 4,	0,	sys_ptrace,		"ptrace"	}, /* 26 */
 	{ 1,	0,	sys_alarm,		"alarm"		}, /* 27 */
@ -75,10 +73,10 @@
 	{ 0,	0,	sys_prof,		"prof"		}, /* 44 */
 	{ 1,	0,	sys_brk,		"brk"		}, /* 45 */
 	{ 1,	0,	sys_setgid,		"setgid"	}, /* 46 */
-	{ 0,	0,	sys_getgid,		"getgid"	}, /* 47 */
+	{ 0,	NF,	sys_getgid,		"getgid"	}, /* 47 */
 	{ 3,	TS,	sys_signal,		"signal"	}, /* 48 */
-	{ 0,	0,	sys_geteuid,		"geteuid"	}, /* 49 */
-	{ 0,	0,	sys_getegid,		"getegid"	}, /* 50 */
+	{ 0,	NF,	sys_geteuid,		"geteuid"	}, /* 49 */
+	{ 0,	NF,	sys_getegid,		"getegid"	}, /* 50 */
 	{ 1,	TF,	sys_acct,		"acct"		}, /* 51 */
 	{ 2,	TF,	sys_umount2,		"umount"	}, /* 52 */
 	{ 0,	0,	sys_lock,		"lock"		}, /* 53 */
@ -96,8 +94,8 @@
 	{ 0,	0,	sys_getpgrp,		"getpgrp"	}, /* 65 */
 	{ 0,	0,	sys_setsid,		"setsid"	}, /* 66 */
 	{ 3,	TS,	sys_sigaction,		"sigaction"	}, /* 67 */
-	{ 0,	TS,	sys_siggetmask,		"siggetmask"	}, /* 68 */
-	{ 1,	TS,	sys_sigsetmask,		"sigsetmask"	}, /* 69 */
+	{ 0,	TS,	sys_siggetmask,		"sgetmask"	}, /* 68 */
+	{ 1,	TS,	sys_sigsetmask,		"ssetmask"	}, /* 69 */
 	{ 2,	0,	sys_setreuid,		"setreuid"	}, /* 70 */
 	{ 2,	0,	sys_setregid,		"setregid"	}, /* 71 */
 	{ 3,	TS,	sys_sigsuspend,		"sigsuspend"	}, /* 72 */
@ -115,10 +113,10 @@
 	{ 2,	TF,	sys_oldlstat,		"oldlstat"	}, /* 84 */
 	{ 3,	TF,	sys_readlink,		"readlink"	}, /* 85 */
 	{ 1,	TF,	sys_uselib,		"uselib"	}, /* 86 */
-	{ 1,	TF,	sys_swapon,		"swapon"	}, /* 87 */
-	{ 3,	0,	sys_reboot,		"reboot"	}, /* 88 */
+	{ 2,	TF,	sys_swapon,		"swapon"	}, /* 87 */
+	{ 4,	0,	sys_reboot,		"reboot"	}, /* 88 */
 	{ 3,	0,	sys_readdir,		"readdir"	}, /* 89 */
-	{ 6,	0,	sys_old_mmap,		"old_mmap"	}, /* 90 */
+	{ 6,	TD,	sys_old_mmap,		"old_mmap"	}, /* 90 */
 	{ 2,	0,	sys_munmap,		"munmap"	}, /* 91 */
 	{ 2,	TF,	sys_truncate,		"truncate"	}, /* 92 */
 	{ 2,	0,	sys_ftruncate,		"ftruncate"	}, /* 93 */
@ -130,7 +128,7 @@
 	{ 2,	TF,	sys_statfs,		"statfs"	}, /* 99 */
 	{ 2,	0,	sys_fstatfs,		"fstatfs"	}, /* 100 */
 	{ 3,	0,	sys_ioperm,		"ioperm"	}, /* 101 */
-	{ 2,	0,	sys_socketcall,		"socketcall", SYS_socketcall }, /* 102 */
+	{ 2,	0,	sys_socketcall,		"socketcall"	}, /* 102 */
 	{ 3,	0,	sys_syslog,		"syslog"	}, /* 103 */
 	{ 3,	0,	sys_setitimer,		"setitimer"	}, /* 104 */
 	{ 2,	0,	sys_getitimer,		"getitimer"	}, /* 105 */
@ -142,13 +140,13 @@
 	{ 0,	0,	sys_vhangup,		"vhangup"	}, /* 111 */
 	{ 0,	0,	sys_idle,		"idle"		}, /* 112 */
 	{ 1,	0,	sys_vm86old,		"vm86old"	}, /* 113 */
-	{ 4,	TP,	sys_wait4,		"wait4", SYS_wait4 }, /* 114 */
-	{ 1,	0,	sys_swapoff,		"swapoff"	}, /* 115 */
+	{ 4,	TP,	sys_wait4,		"wait4"		}, /* 114 */
+	{ 1,	TF,	sys_swapoff,		"swapoff"	}, /* 115 */
 	{ 1,	0,	sys_sysinfo,		"sysinfo"	}, /* 116 */
-	{ 6,	0,	sys_ipc,		"ipc", SYS_ipc }, /* 117 */
-	{ 1,	0,	sys_fsync,		"fsync"		}, /* 118 */
-	{ 1,	TS,	sys_sigreturn,		"sigreturn"	}, /* 119 */
-	{ 5,	TP,	sys_clone,		"clone", SYS_clone }, /* 120 */
+	{ 6,	TI,	sys_ipc,		"ipc"		}, /* 117 */
+	{ 1,	TD,	sys_fsync,		"fsync"		}, /* 118 */
+	{ 0,	TS,	sys_sigreturn,		"sigreturn"	}, /* 119 */
+	{ 5,	TP,	sys_clone,		"clone"		}, /* 120 */
 	{ 2,	0,	sys_setdomainname,	"setdomainname"	}, /* 121 */
 	{ 1,	0,	sys_uname,		"uname"		}, /* 122 */
 	{ 4,	0,	sys_cacheflush,		"cacheflush"	}, /* 123 */
@ -163,24 +161,24 @@
 	{ 1,	0,	sys_getpgid,		"getpgid"	}, /* 132 */
 	{ 1,	0,	sys_fchdir,		"fchdir"	}, /* 133 */
 	{ 0,	0,	sys_bdflush,		"bdflush"	}, /* 134 */
-	{ 3,	0,	sys_sysfs,		"sysfs", SYS_sysfs }, /* 135 */
+	{ 3,	0,	sys_sysfs,		"sysfs"		}, /* 135 */
 	{ 1,	0,	sys_personality,	"personality"	}, /* 136 */
 	{ 5,	0,	sys_afs_syscall,	"afs_syscall"	}, /* 137 */
-	{ 1,	0,	sys_setfsuid,		"setfsuid"	}, /* 138 */
-	{ 1,	0,	sys_setfsgid,		"setfsgid"	}, /* 139 */
+	{ 1,	NF,	sys_setfsuid,		"setfsuid"	}, /* 138 */
+	{ 1,	NF,	sys_setfsgid,		"setfsgid"	}, /* 139 */
 	{ 5,	0,	sys_llseek,		"_llseek"	}, /* 140 */
 	{ 3,	0,	sys_getdents,		"getdents"	}, /* 141 */
 	{ 5,	0,	sys_select,		"select"	}, /* 142 */
 	{ 2,	0,	sys_flock,		"flock"		}, /* 143 */
 	{ 3,	0,	sys_msync,		"msync"		}, /* 144 */
-	{ 3,	0,	sys_readv,		"readv", SYS_readv }, /* 145 */
-	{ 3,	0,	sys_writev,		"writev", SYS_writev }, /* 146 */
+	{ 3,	0,	sys_readv,		"readv"		}, /* 145 */
+	{ 3,	0,	sys_writev,		"writev"	}, /* 146 */
 	{ 1,	0,	sys_getsid,		"getsid"	}, /* 147 */
 	{ 1,	0,	sys_fdatasync,		"fdatasync"	}, /* 148 */
 	{ 1,	0,	sys_sysctl,		"_sysctl"	}, /* 149 */
 	{ 2,	0,	sys_mlock,		"mlock"		}, /* 150 */
 	{ 2,	0,	sys_munlock,		"munlock"	}, /* 151 */
-	{ 2,	0,	sys_mlockall,		"mlockall"	}, /* 152 */
+	{ 1,	0,	sys_mlockall,		"mlockall"	}, /* 152 */
 	{ 0,	0,	sys_munlockall,		"munlockall"	}, /* 153 */
 	{ 0,	0,	sys_sched_setparam,	"sched_setparam"}, /* 154 */
 	{ 2,	0,	sys_sched_getparam,	"sched_getparam"}, /* 155 */
@ -191,25 +189,25 @@
 	{ 1,	0,	sys_sched_get_priority_min,"sched_get_priority_min"}, /* 160 */
 	{ 2,	0,	sys_sched_rr_get_interval,"sched_rr_get_interval"}, /* 161 */
 	{ 2,	0,	sys_nanosleep,		"nanosleep"	}, /* 162 */
-	{ 4,	0,	sys_mremap,		"mremap"	}, /* 163 */
+	{ 5,	0,	sys_mremap,		"mremap"	}, /* 163 */
 	{ 3,	0,	sys_setresuid,		"setresuid"	}, /* 164 */
 	{ 3,	0,	sys_getresuid,		"getresuid"	}, /* 165 */
 	{ 5,	0,	printargs,		"getpagesize"	}, /* 166 */
 	{ 5,	0,	sys_query_module,	"query_module"	}, /* 167 */
 	{ 3,	0,	sys_poll,		"poll"		}, /* 168 */
-	{ 3,	0,	printargs,		"nfsservctl"	}, /* 169 */
+	{ 3,	0,	sys_nfsservctl,		"nfsservctl"	}, /* 169 */
 	{ 3,	0,	sys_setresgid,		"setresgid"	}, /* 170 */
 	{ 3,	0,	sys_getresgid,		"getresgid"	}, /* 171 */
 	{ 5,	0,	sys_prctl,		"prctl"		}, /* 172 */
-	{ 1,	TS,	printargs,		"rt_sigreturn"	}, /* 173 */
-	{ 4,	TS,	sys_rt_sigaction,	"rt_sigaction"  }, /* 174 */
+	{ 0,	TS,	sys_rt_sigreturn,	"rt_sigreturn"	}, /* 173 */
+	{ 4,	TS,	sys_rt_sigaction,	"rt_sigaction"	}, /* 174 */
 	{ 4,	TS,	sys_rt_sigprocmask,	"rt_sigprocmask"}, /* 175 */
 	{ 2,	TS,	sys_rt_sigpending,	"rt_sigpending"	}, /* 176 */
 	{ 4,	TS,	sys_rt_sigtimedwait,	"rt_sigtimedwait"}, /* 177 */
 	{ 3,	TS,	sys_rt_sigqueueinfo,    "rt_sigqueueinfo"}, /* 178 */
 	{ 2,	TS,	sys_rt_sigsuspend,	"rt_sigsuspend"	}, /* 179 */
-	{ 5,	TF,	sys_pread,		"pread64", SYS_read }, /* 180 */
-	{ 5,	TF,	sys_pwrite,		"pwrite64", SYS_write }, /* 181 */
+	{ 5,	TF,	sys_pread,		"pread64"	}, /* 180 */
+	{ 5,	TF,	sys_pwrite,		"pwrite64"	}, /* 181 */
 	{ 3,	TF,	sys_chown,		"lchown"	}, /* 182 */
 	{ 2,	TF,	sys_getcwd,		"getcwd"	}, /* 183 */
 	{ 2,	0,	sys_capget,		"capget"	}, /* 184 */
@ -218,19 +216,19 @@
 	{ 4,	TD|TN,	sys_sendfile,		"sendfile"	}, /* 187 */
 	{ 5,	0,	sys_getpmsg,		"getpmsg"	}, /* 188 */
 	{ 5,	0,	sys_putpmsg,		"putpmsg"	}, /* 189 */
-	{ 0,	TP,	sys_vfork,		"vfork", SYS_vfork }, /* 190 */
+	{ 0,	TP,	sys_vfork,		"vfork"		}, /* 190 */
 	{ 2,	0,	sys_getrlimit,		"getrlimit"	}, /* 191 */
-	{ 6,	0,	sys_mmap,		"mmap2"		}, /* 192 */
+	{ 6,	TD,	sys_mmap,		"mmap2"		}, /* 192 */
 	{ 3,	TF,	sys_truncate64,		"truncate64"	}, /* 193 */
 	{ 3,	TF,	sys_ftruncate64,	"ftruncate64"	}, /* 194 */
 	{ 2,	TF,	sys_stat64,		"stat64"	}, /* 195 */
 	{ 2,	TF,	sys_lstat64,		"lstat64"	}, /* 196 */
 	{ 2,	TF,	sys_fstat64,		"fstat64"	}, /* 197 */
 	{ 3,	TF,	sys_chown,		"chown32"	}, /* 198 */
-	{ 0,	0,	sys_getuid,		"getuid32"	}, /* 199 */
-	{ 0,	0,	sys_getgid,		"getgid32"	}, /* 200 */
-	{ 0,	0,	sys_geteuid,		"geteuid32"	}, /* 201 */
-	{ 0,	0,	sys_geteuid,		"getegid32"	}, /* 202 */
+	{ 0,	NF,	sys_getuid,		"getuid32"	}, /* 199 */
+	{ 0,	NF,	sys_getgid,		"getgid32"	}, /* 200 */
+	{ 0,	NF,	sys_geteuid,		"geteuid32"	}, /* 201 */
+	{ 0,	NF,	sys_geteuid,		"getegid32"	}, /* 202 */
 	{ 2,	0,	sys_setreuid,		"setreuid32"	}, /* 203 */
 	{ 2,	0,	sys_setregid,		"setregid32"	}, /* 204 */
 	{ 2,	0,	sys_getgroups32,	"getgroups32"	}, /* 205 */
@ -243,28 +241,28 @@
 	{ 3,	TF,	sys_chown,		"lchown32"	}, /* 212 */
 	{ 1,	0,	sys_setuid,		"setuid32"	}, /* 213 */
 	{ 1,	0,	sys_setgid,		"setgid32"	}, /* 214 */
-	{ 1,	0,	sys_setfsuid,		"setfsuid32"	}, /* 215 */
-	{ 1,	0,	sys_setfsgid,		"setfsgid32"	}, /* 216 */
+	{ 1,	NF,	sys_setfsuid,		"setfsuid32"	}, /* 215 */
+	{ 1,	NF,	sys_setfsgid,		"setfsgid32"	}, /* 216 */
 	{ 2,	TF,	sys_pivotroot,		"pivot_root"	}, /* 217 */
-	{ 5,	0,	printargs,		"SYS_218"	}, /* 218 */
-	{ 5,	0,	printargs,		"SYS_219"	}, /* 219 */
+	{ 5,	0,	NULL,			NULL		}, /* 218 */
+	{ 5,	0,	NULL,			NULL		}, /* 219 */
 	{ 3,	TD,	sys_getdents64,		"getdents64"	}, /* 220 */
-	{ 0,	0,	printargs,		"gettid"	}, /* 221 */
+	{ 0,	0,	sys_gettid,		"gettid"	}, /* 221 */
 	{ 2,	TS,	sys_kill,		"tkill"		}, /* 222 */
 	{ 5,	TF,	sys_setxattr,		"setxattr"	}, /* 223 */
 	{ 5,	TF,	sys_setxattr,		"lsetxattr"	}, /* 224 */
 	{ 5,	0,	sys_fsetxattr,		"fsetxattr"	}, /* 225 */
 	{ 4,	TF,	sys_getxattr,		"getxattr"	}, /* 226 */
 	{ 4,	TF,	sys_getxattr,		"lgetxattr"	}, /* 227 */
-	{ 4,	0,	sys_fgetxattr,		"fgetxattr"	}, /* 228 */
+	{ 4,	TD,	sys_fgetxattr,		"fgetxattr"	}, /* 228 */
 	{ 3,	TF,	sys_listxattr,		"listxattr"	}, /* 229 */
 	{ 3,	TF,	sys_listxattr,		"llistxattr"	}, /* 230 */
-	{ 3,	0,	sys_flistxattr,		"flistxattr"	}, /* 231 */
+	{ 3,	TD,	sys_flistxattr,		"flistxattr"	}, /* 231 */
 	{ 2,	TF,	sys_removexattr,	"removexattr"	}, /* 232 */
 	{ 2,	TF,	sys_removexattr,	"lremovexattr"	}, /* 233 */
-	{ 2,	0,	sys_fremovexattr,	"fremovexattr"	}, /* 234 */
+	{ 2,	TD,	sys_fremovexattr,	"fremovexattr"	}, /* 234 */
 	{ 6,	0,	sys_futex,		"futex"		}, /* 235 */
-	{ 4,	TF,	sys_sendfile64,		"sendfile64"	}, /* 236 */
+	{ 4,	TD|TN,	sys_sendfile64,		"sendfile64"	}, /* 236 */
 	{ 3,	0,	sys_mincore,		"mincore"	}, /* 237 */
 	{ 3,	0,	sys_madvise,		"madvise"	}, /* 238 */
 	{ 3,	0,	sys_fcntl,		"fcntl64"	}, /* 239 */
@ -274,14 +272,14 @@
 	{ 5,	0,	sys_io_getevents,	"io_getevents"	}, /* 243 */
 	{ 3,	0,	sys_io_submit,		"io_submit"	}, /* 244 */
 	{ 3,	0,	sys_io_cancel,		"io_cancel"	}, /* 245 */
-	{ 5,	TF,	sys_fadvise64,		"fadvise64"	}, /* 246 */
-	{ 1,	TP,	sys_exit,		"exit_group", __NR_exit_group }, /* 247 */
-	{ 4,	0,	printargs,		"lookup_dcookie"}, /* 248 */
-	{ 1,	0,	sys_epoll_create,	"epoll_create"	}, /* 249 */
-	{ 4,	0,	sys_epoll_ctl,		"epoll_ctl"	}, /* 250 */
-	{ 4,	0,	sys_epoll_wait,		"epoll_wait"	}, /* 251 */
+	{ 5,	TD,	sys_fadvise64,		"fadvise64"	}, /* 246 */
+	{ 1,	TP,	sys_exit,		"exit_group"	}, /* 247 */
+	{ 4,	0,	sys_lookup_dcookie,	"lookup_dcookie"}, /* 248 */
+	{ 1,	TD,	sys_epoll_create,	"epoll_create"	}, /* 249 */
+	{ 4,	TD,	sys_epoll_ctl,		"epoll_ctl"	}, /* 250 */
+	{ 4,	TD,	sys_epoll_wait,		"epoll_wait"	}, /* 251 */
 	{ 5,	0,	sys_remap_file_pages,	"remap_file_pages"}, /* 252 */
-	{ 1,	0,	printargs,		"set_tid_address"}, /* 253 */
+	{ 1,	0,	sys_set_tid_address,	"set_tid_address"}, /* 253 */
 	{ 3,	0,	sys_timer_create,	"timer_create"	}, /* 254 */
 	{ 4,	0,	sys_timer_settime,	"timer_settime"	}, /* 255 */
 	{ 2,	0,	sys_timer_gettime,	"timer_gettime"	}, /* 256 */
@ -295,7 +293,7 @@
 	{ 3,	TF,	sys_fstatfs64,		"fstatfs64"	}, /* 264 */
 	{ 3,	TS,	sys_tgkill,		"tgkill"	}, /* 265 */
 	{ 2,	TF,	sys_utimes,		"utimes"	}, /* 266 */
-	{ 6,	TF,	sys_fadvise64_64,	"fadvise64_64"	}, /* 267 */
+	{ 6,	TD,	sys_fadvise64_64,	"fadvise64_64"	}, /* 267 */
 	{ 6,	0,	sys_mbind,		"mbind"		}, /* 268 */
 	{ 5,	0,	sys_get_mempolicy,	"get_mempolicy"	}, /* 269 */
 	{ 3,	0,	sys_set_mempolicy,	"set_mempolicy"	}, /* 270 */
@ -305,135 +303,134 @@
 	{ 5,	0,	sys_mq_timedreceive,	"mq_timedreceive" }, /* 274 */
 	{ 2,	0,	sys_mq_notify,		"mq_notify"	}, /* 275 */
 	{ 3,	0,	sys_mq_getsetattr,	"mq_getsetattr"	}, /* 276 */
-	{ 5,	TP,	sys_waitid,		"waitid", SYS_waitid }, /* 277 */
-	{ 5,	0,	printargs,		"vserver"	}, /* 278 */
-	{ 5,	0,	printargs,		"add_key"	}, /* 279 */
-	{ 5,	0,	printargs,		"request_key"	}, /* 280 */
-	{ 5,	0,	printargs,		"keyctl"	}, /* 281 */
-
-	{ 5,	0,	printargs,		"SYS_282"	}, /* 282 */
-	{ 5,	0,	printargs,		"SYS_283"	}, /* 283 */
-	{ 5,	0,	printargs,		"SYS_284"	}, /* 284 */
-	{ 5,	0,	printargs,		"SYS_285"	}, /* 285 */
-	{ 5,	0,	printargs,		"SYS_286"	}, /* 286 */
-	{ 5,	0,	printargs,		"SYS_287"	}, /* 287 */
-	{ 5,	0,	printargs,		"SYS_288"	}, /* 288 */
-	{ 5,	0,	printargs,		"SYS_289"	}, /* 289 */
-	{ 5,	0,	printargs,		"SYS_290"	}, /* 290 */
-	{ 5,	0,	printargs,		"SYS_291"	}, /* 291 */
-	{ 5,	0,	printargs,		"SYS_292"	}, /* 292 */
-	{ 5,	0,	printargs,		"SYS_293"	}, /* 293 */
-	{ 5,	0,	printargs,		"SYS_294"	}, /* 294 */
-	{ 5,	0,	printargs,		"SYS_295"	}, /* 295 */
-	{ 5,	0,	printargs,		"SYS_296"	}, /* 296 */
-	{ 5,	0,	printargs,		"SYS_297"	}, /* 297 */
-	{ 5,	0,	printargs,		"SYS_298"	}, /* 298 */
-	{ 5,	0,	printargs,		"SYS_299"	}, /* 299 */
-	{ 5,	0,	printargs,		"SYS_300"	}, /* 300 */
-	{ 5,	0,	printargs,		"SYS_301"	}, /* 301 */
-	{ 5,	0,	printargs,		"SYS_302"	}, /* 302 */
-	{ 5,	0,	printargs,		"SYS_303"	}, /* 303 */
-	{ 5,	0,	printargs,		"SYS_304"	}, /* 304 */
-	{ 5,	0,	printargs,		"SYS_305"	}, /* 305 */
-	{ 5,	0,	printargs,		"SYS_306"	}, /* 306 */
-	{ 5,	0,	printargs,		"SYS_307"	}, /* 307 */
-	{ 5,	0,	printargs,		"SYS_308"	}, /* 308 */
-	{ 5,	0,	printargs,		"SYS_309"	}, /* 309 */
+	{ 5,	TP,	sys_waitid,		"waitid"	}, /* 277 */
+	{ 5,	0,	sys_vserver,		"vserver"	}, /* 278 */
+	{ 5,	0,	sys_add_key,		"add_key"	}, /* 279 */
+	{ 5,	0,	sys_request_key,	"request_key"	}, /* 280 */
+	{ 5,	0,	sys_keyctl,		"keyctl"	}, /* 281 */
+	{ 3,	0,	sys_ioprio_set,		"ioprio_set"	}, /* 282 */
+	{ 2,	0,	sys_ioprio_get,		"ioprio_get"	}, /* 283 */
+	{ 0,	TD,	sys_inotify_init,	"inotify_init"	}, /* 284 */
+	{ 3,	TD,	sys_inotify_add_watch,	"inotify_add_watch" }, /* 285 */
+	{ 2,	TD,	sys_inotify_rm_watch,	"inotify_rm_watch" }, /* 286 */
+	{ 4,	0,	sys_migrate_pages,	"migrate_pages"	}, /* 287 */
+	{ 4,	TD|TF,	sys_openat,		"openat"	}, /* 288 */
+	{ 3,	TD|TF,	sys_mkdirat,		"mkdirat"	}, /* 289 */
+	{ 4,	TD|TF,	sys_mknodat,		"mknodat"	}, /* 290 */
+	{ 5,	TD|TF,	sys_fchownat,		"fchownat"	}, /* 291 */
+	{ 3,	TD|TF,	sys_futimesat,		"futimesat"	}, /* 292 */
+	{ 4,	TD|TF,	sys_newfstatat,		"fstatat64"	}, /* 293 */
+	{ 3,	TD|TF,	sys_unlinkat,		"unlinkat"	}, /* 294 */
+	{ 4,	TD|TF,	sys_renameat,		"renameat"	}, /* 295 */
+	{ 5,	TD|TF,	sys_linkat,		"linkat"	}, /* 296 */
+	{ 3,	TD|TF,	sys_symlinkat,		"symlinkat"	}, /* 297 */
+	{ 4,	TD|TF,	sys_readlinkat,		"readlinkat"	}, /* 298 */
+	{ 3,	TD|TF,	sys_fchmodat,		"fchmodat"	}, /* 299 */
+	{ 3,	TD|TF,	sys_faccessat,		"faccessat"	}, /* 300 */
+	{ 6,	TD,	sys_pselect6,		"pselect6"	}, /* 301 */
+	{ 5,	TD,	sys_ppoll,		"ppoll"		}, /* 302 */
+	{ 1,	TP,	sys_unshare,		"unshare"	}, /* 303 */
+	{ 2,	0,	sys_set_robust_list,	"set_robust_list" }, /* 304 */
+	{ 3,	0,	sys_get_robust_list,	"get_robust_list" }, /* 305 */
+	{ 6,	TD,	sys_splice,		"splice"	}, /* 306 */
+	{ 4,	TD,	sys_sync_file_range,	"sync_file_range" }, /* 307 */
+	{ 4,	TD,	sys_tee,		"tee"		}, /* 308 */
+	{ 4,	TD,	sys_vmsplice,		"vmsplice"	}, /* 309 */
 	{ 6,	0,	sys_move_pages,		"move_pages"	}, /* 310 */
-	{ 5,	0,	printargs,		"SYS_311"	}, /* 311 */
-	{ 5,	0,	printargs,		"SYS_312"	}, /* 312 */
-	{ 5,	0,	printargs,		"SYS_313"	}, /* 313 */
-	{ 5,	0,	printargs,		"SYS_314"	}, /* 314 */
-	{ 5,	0,	printargs,		"SYS_315"	}, /* 315 */
-	{ 5,	0,	printargs,		"SYS_316"	}, /* 316 */
-	{ 5,	0,	printargs,		"SYS_317"	}, /* 317 */
-	{ 5,	0,	printargs,		"SYS_318"	}, /* 318 */
-	{ 5,	0,	printargs,		"SYS_319"	}, /* 319 */
-	{ 5,	0,	printargs,		"SYS_320"	}, /* 320 */
-	{ 5,	0,	printargs,		"SYS_321"	}, /* 321 */
-	{ 5,	0,	printargs,		"SYS_322"	}, /* 322 */
-	{ 5,	0,	printargs,		"SYS_323"	}, /* 323 */
-	{ 5,	0,	printargs,		"SYS_324"	}, /* 324 */
-	{ 5,	0,	printargs,		"SYS_325"	}, /* 325 */
-	{ 5,	0,	printargs,		"SYS_326"	}, /* 326 */
-	{ 5,	0,	printargs,		"SYS_327"	}, /* 327 */
-	{ 5,	0,	printargs,		"SYS_328"	}, /* 328 */
-	{ 5,	0,	printargs,		"SYS_329"	}, /* 329 */
-	{ 5,	0,	printargs,		"SYS_330"	}, /* 330 */
-	{ 5,	0,	printargs,		"SYS_331"	}, /* 331 */
-	{ 5,	0,	printargs,		"SYS_332"	}, /* 332 */
-	{ 5,	0,	printargs,		"SYS_333"	}, /* 333 */
-	{ 5,	0,	printargs,		"SYS_334"	}, /* 334 */
-	{ 5,	0,	printargs,		"SYS_335"	}, /* 335 */
-	{ 5,	0,	printargs,		"SYS_336"	}, /* 336 */
-	{ 5,	0,	printargs,		"SYS_337"	}, /* 337 */
-	{ 5,	0,	printargs,		"SYS_338"	}, /* 338 */
-	{ 5,	0,	printargs,		"SYS_339"	}, /* 339 */
-	{ 5,	0,	printargs,		"SYS_340"	}, /* 340 */
-	{ 5,	0,	printargs,		"SYS_341"	}, /* 341 */
-	{ 5,	0,	printargs,		"SYS_342"	}, /* 342 */
-	{ 5,	0,	printargs,		"SYS_343"	}, /* 343 */
-	{ 5,	0,	printargs,		"SYS_344"	}, /* 344 */
-	{ 5,	0,	printargs,		"SYS_345"	}, /* 345 */
-	{ 5,	0,	printargs,		"SYS_346"	}, /* 346 */
-	{ 5,	0,	printargs,		"SYS_347"	}, /* 347 */
-	{ 5,	0,	printargs,		"SYS_348"	}, /* 348 */
-	{ 5,	0,	printargs,		"SYS_349"	}, /* 349 */
-	{ 5,	0,	printargs,		"SYS_350"	}, /* 350 */
-	{ 5,	0,	printargs,		"SYS_351"	}, /* 351 */
-	{ 5,	0,	printargs,		"SYS_352"	}, /* 352 */
-	{ 5,	0,	printargs,		"SYS_353"	}, /* 353 */
-	{ 5,	0,	printargs,		"SYS_354"	}, /* 354 */
-	{ 5,	0,	printargs,		"SYS_355"	}, /* 355 */
-	{ 5,	0,	printargs,		"SYS_356"	}, /* 356 */
-	{ 5,	0,	printargs,		"SYS_357"	}, /* 357 */
-	{ 5,	0,	printargs,		"SYS_358"	}, /* 358 */
-	{ 5,	0,	printargs,		"SYS_359"	}, /* 359 */
-	{ 5,	0,	printargs,		"SYS_360"	}, /* 360 */
-	{ 5,	0,	printargs,		"SYS_361"	}, /* 361 */
-	{ 5,	0,	printargs,		"SYS_362"	}, /* 362 */
-	{ 5,	0,	printargs,		"SYS_363"	}, /* 363 */
-	{ 5,	0,	printargs,		"SYS_364"	}, /* 364 */
-	{ 5,	0,	printargs,		"SYS_365"	}, /* 365 */
-	{ 5,	0,	printargs,		"SYS_366"	}, /* 366 */
-	{ 5,	0,	printargs,		"SYS_367"	}, /* 367 */
-	{ 5,	0,	printargs,		"SYS_368"	}, /* 368 */
-	{ 5,	0,	printargs,		"SYS_369"	}, /* 369 */
-	{ 5,	0,	printargs,		"SYS_370"	}, /* 370 */
-	{ 5,	0,	printargs,		"SYS_371"	}, /* 371 */
-	{ 5,	0,	printargs,		"SYS_372"	}, /* 372 */
-	{ 5,	0,	printargs,		"SYS_373"	}, /* 373 */
-	{ 5,	0,	printargs,		"SYS_374"	}, /* 374 */
-	{ 5,	0,	printargs,		"SYS_375"	}, /* 375 */
-	{ 5,	0,	printargs,		"SYS_376"	}, /* 376 */
-	{ 5,	0,	printargs,		"SYS_377"	}, /* 377 */
-	{ 5,	0,	printargs,		"SYS_378"	}, /* 378 */
-	{ 5,	0,	printargs,		"SYS_379"	}, /* 379 */
-	{ 5,	0,	printargs,		"SYS_380"	}, /* 380 */
-	{ 5,	0,	printargs,		"SYS_381"	}, /* 381 */
-	{ 5,	0,	printargs,		"SYS_382"	}, /* 382 */
-	{ 5,	0,	printargs,		"SYS_383"	}, /* 383 */
-	{ 5,	0,	printargs,		"SYS_384"	}, /* 384 */
-	{ 5,	0,	printargs,		"SYS_385"	}, /* 385 */
-	{ 5,	0,	printargs,		"SYS_386"	}, /* 386 */
-	{ 5,	0,	printargs,		"SYS_387"	}, /* 387 */
-	{ 5,	0,	printargs,		"SYS_388"	}, /* 388 */
-	{ 5,	0,	printargs,		"SYS_389"	}, /* 389 */
-	{ 5,	0,	printargs,		"SYS_390"	}, /* 390 */
-	{ 5,	0,	printargs,		"SYS_391"	}, /* 391 */
-	{ 5,	0,	printargs,		"SYS_392"	}, /* 392 */
-	{ 5,	0,	printargs,		"SYS_393"	}, /* 393 */
-	{ 5,	0,	printargs,		"SYS_394"	}, /* 394 */
-	{ 5,	0,	printargs,		"SYS_395"	}, /* 395 */
-	{ 5,	0,	printargs,		"SYS_396"	}, /* 396 */
-	{ 5,	0,	printargs,		"SYS_397"	}, /* 397 */
-	{ 5,	0,	printargs,		"SYS_398"	}, /* 398 */
-	{ 5,	0,	printargs,		"SYS_399"	}, /* 399 */
+	{ 3,	0,	sys_sched_setaffinity,	"sched_setaffinity" },/* 311 */
+	{ 3,	0,	sys_sched_getaffinity,	"sched_getaffinity" },/* 312 */
+	{ 4,	0,	sys_kexec_load,		"kexec_load"	}, /* 313 */
+	{ 3,	0,	sys_getcpu,		"getcpu"	}, /* 314 */
+	{ 6,	TD,	sys_epoll_pwait,	"epoll_pwait"	}, /* 315 */
+	{ 4,	TD|TF,	sys_utimensat,		"utimensat"	}, /* 316 */
+	{ 3,	TD|TS,	sys_signalfd,		"signalfd"	}, /* 317 */
+	{ 2,	TD,	sys_timerfd_create,	"timerfd_create"}, /* 318 */
+	{ 1,	TD,	sys_eventfd,		"eventfd"	}, /* 319 */
+	{ 6,	TD,	sys_fallocate,		"fallocate"	}, /* 320 */
+	{ 4,	TD,	sys_timerfd_settime,	"timerfd_settime"}, /* 321 */
+	{ 2,	TD,	sys_timerfd_gettime,	"timerfd_gettime"}, /* 322 */
+	{ 4,	TD|TS,	sys_signalfd4,		"signalfd4"	}, /* 323 */
+	{ 2,	TD,	sys_eventfd2,		"eventfd2"	}, /* 324 */
+	{ 1,	TD,	sys_epoll_create1,	"epoll_create1"	}, /* 325 */
+	{ 3,	TD,	sys_dup3,		"dup3"		}, /* 326 */
+	{ 2,	TD,	sys_pipe2,		"pipe2"		}, /* 327 */
+	{ 1,	TD,	sys_inotify_init1,	"inotify_init1"	}, /* 328 */
+	{ 5,	TD,	sys_preadv,		"preadv"	}, /* 329 */
+	{ 5,	TD,	sys_pwritev,		"pwritev"	}, /* 330 */
+	{ 4,	TP|TS,	sys_rt_tgsigqueueinfo,	"rt_tgsigqueueinfo"}, /* 331 */
+	{ 5,	TD,	sys_perf_event_open,	"perf_event_open"}, /* 332 */
+	{ 0,	0,	sys_get_thread_area,	"get_thread_area"}, /* 333 */
+	{ 1,	0,	sys_set_thread_area,	"set_thread_area"}, /* 334 */
+	{ 6,	0,	printargs,		"atomic_comxchg_32"}, /* 335 */
+	{ 0,	0,	printargs,		"atomic_barrier"}, /* 336 */
+	{ 2,	TD,	sys_fanotify_init,	"fanotify_init"	}, /* 337 */
+	{ 5,	TD|TF,	sys_fanotify_mark,	"fanotify_mark"	}, /* 338 */
+	{ 4,	0,	sys_prlimit64,		"prlimit64"	}, /* 339 */
+	{ 5,	TD|TF,	sys_name_to_handle_at,	"name_to_handle_at"}, /* 340 */
+	{ 3,	TD,	sys_open_by_handle_at,	"open_by_handle_at"}, /* 341 */
+	{ 2,	0,	sys_clock_adjtime,	"clock_adjtime"	}, /* 342 */
+	{ 1,	TD,	sys_syncfs,		"syncfs"	}, /* 343 */
+	{ 2,	TD,	sys_setns,		"setns"		}, /* 344 */
+	{ 6,	0,	sys_process_vm_readv,	"process_vm_readv"	}, /* 345 */
+	{ 6,	0,	sys_process_vm_writev,	"process_vm_writev"	}, /* 346 */
+	{ 5,	0,	NULL,			NULL		}, /* 347 */
+	{ 5,	0,	NULL,			NULL		}, /* 348 */
+	{ 5,	0,	NULL,			NULL		}, /* 349 */
+	{ 5,	0,	NULL,			NULL		}, /* 350 */
+	{ 5,	0,	NULL,			NULL		}, /* 351 */
+	{ 5,	0,	NULL,			NULL		}, /* 352 */
+	{ 5,	0,	NULL,			NULL		}, /* 353 */
+	{ 5,	0,	NULL,			NULL		}, /* 354 */
+	{ 5,	0,	NULL,			NULL		}, /* 355 */
+	{ 5,	0,	NULL,			NULL		}, /* 356 */
+	{ 5,	0,	NULL,			NULL		}, /* 357 */
+	{ 5,	0,	NULL,			NULL		}, /* 358 */
+	{ 5,	0,	NULL,			NULL		}, /* 359 */
+	{ 5,	0,	NULL,			NULL		}, /* 360 */
+	{ 5,	0,	NULL,			NULL		}, /* 361 */
+	{ 5,	0,	NULL,			NULL		}, /* 362 */
+	{ 5,	0,	NULL,			NULL		}, /* 363 */
+	{ 5,	0,	NULL,			NULL		}, /* 364 */
+	{ 5,	0,	NULL,			NULL		}, /* 365 */
+	{ 5,	0,	NULL,			NULL		}, /* 366 */
+	{ 5,	0,	NULL,			NULL		}, /* 367 */
+	{ 5,	0,	NULL,			NULL		}, /* 368 */
+	{ 5,	0,	NULL,			NULL		}, /* 369 */
+	{ 5,	0,	NULL,			NULL		}, /* 370 */
+	{ 5,	0,	NULL,			NULL		}, /* 371 */
+	{ 5,	0,	NULL,			NULL		}, /* 372 */
+	{ 5,	0,	NULL,			NULL		}, /* 373 */
+	{ 5,	0,	NULL,			NULL		}, /* 374 */
+	{ 5,	0,	NULL,			NULL		}, /* 375 */
+	{ 5,	0,	NULL,			NULL		}, /* 376 */
+	{ 5,	0,	NULL,			NULL		}, /* 377 */
+	{ 5,	0,	NULL,			NULL		}, /* 378 */
+	{ 5,	0,	NULL,			NULL		}, /* 379 */
+	{ 5,	0,	NULL,			NULL		}, /* 380 */
+	{ 5,	0,	NULL,			NULL		}, /* 381 */
+	{ 5,	0,	NULL,			NULL		}, /* 382 */
+	{ 5,	0,	NULL,			NULL		}, /* 383 */
+	{ 5,	0,	NULL,			NULL		}, /* 384 */
+	{ 5,	0,	NULL,			NULL		}, /* 385 */
+	{ 5,	0,	NULL,			NULL		}, /* 386 */
+	{ 5,	0,	NULL,			NULL		}, /* 387 */
+	{ 5,	0,	NULL,			NULL		}, /* 388 */
+	{ 5,	0,	NULL,			NULL		}, /* 389 */
+	{ 5,	0,	NULL,			NULL		}, /* 390 */
+	{ 5,	0,	NULL,			NULL		}, /* 391 */
+	{ 5,	0,	NULL,			NULL		}, /* 392 */
+	{ 5,	0,	NULL,			NULL		}, /* 393 */
+	{ 5,	0,	NULL,			NULL		}, /* 394 */
+	{ 5,	0,	NULL,			NULL		}, /* 395 */
+	{ 5,	0,	NULL,			NULL		}, /* 396 */
+	{ 5,	0,	NULL,			NULL		}, /* 397 */
+	{ 5,	0,	NULL,			NULL		}, /* 398 */
+	{ 5,	0,	NULL,			NULL		}, /* 399 */

 #if SYS_socket_subcall != 400
 #error fix me
 #endif
-	{ 8,	0,	printargs,		"socket_subcall"}, /* 400 */
+	{ 6,	0,	printargs,		"socket_subcall"}, /* 400 */
 	{ 3,	TN,	sys_socket,		"socket"	}, /* 401 */
 	{ 3,	TN,	sys_bind,		"bind"		}, /* 402 */
 	{ 3,	TN,	sys_connect,		"connect"	}, /* 403 */
@ -442,42 +439,43 @@
 	{ 3,	TN,	sys_getsockname,	"getsockname"	}, /* 406 */
 	{ 3,	TN,	sys_getpeername,	"getpeername"	}, /* 407 */
 	{ 4,	TN,	sys_socketpair,		"socketpair"	}, /* 408 */
-	{ 4,	TN,	sys_send,		"send", SYS_sub_send }, /* 409 */
-	{ 4,	TN,	sys_recv,		"recv", SYS_sub_recv }, /* 410 */
-	{ 6,	TN,	sys_sendto,		"sendto", SYS_sub_sendto }, /* 411 */
-	{ 6,	TN,	sys_recvfrom,		"recvfrom", SYS_sub_recvfrom }, /* 412 */
+	{ 4,	TN,	sys_send,		"send"		}, /* 409 */
+	{ 4,	TN,	sys_recv,		"recv"		}, /* 410 */
+	{ 6,	TN,	sys_sendto,		"sendto"	}, /* 411 */
+	{ 6,	TN,	sys_recvfrom,		"recvfrom"	}, /* 412 */
 	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 413 */
 	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 414 */
 	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 415 */
-	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 416 */
+	{ 3,	TN,	sys_sendmsg,		"sendmsg"	}, /* 416 */
 	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 417 */
 	{ 4,	TN,	sys_accept4,		"accept4"	}, /* 418 */
+	{ 5,	TN,	sys_recvmmsg,		"recvmmsg"	}, /* 419 */

-#if SYS_ipc_subcall != 419
+#if SYS_ipc_subcall != 420
 #error fix me
 #endif
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 419 */
-	{ 4,	TI,	sys_semop,		"semop"		}, /* 420 */
-	{ 4,	TI,	sys_semget,		"semget"	}, /* 421 */
-	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 422 */
-	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 423 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 424 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 420 */
+	{ 4,	TI,	sys_semop,		"semop"		}, /* 421 */
+	{ 4,	TI,	sys_semget,		"semget"	}, /* 422 */
+	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 423 */
+	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 424 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 425 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 426 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 427 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 428 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 429 */
-	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 430 */
-	{ 4,	TI,	sys_msgrcv,		"msgrcv"	}, /* 431 */
-	{ 4,	TI,	sys_msgget,		"msgget"	}, /* 432 */
-	{ 4,	TI,	sys_msgctl,		"msgctl"	}, /* 433 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 434 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 430 */
+	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 431 */
+	{ 4,	TI,	sys_msgrcv,		"msgrcv"	}, /* 432 */
+	{ 4,	TI,	sys_msgget,		"msgget"	}, /* 433 */
+	{ 4,	TI,	sys_msgctl,		"msgctl"	}, /* 434 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 435 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 436 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 437 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 438 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 439 */
-	{ 4,	TI,	sys_shmat,		"shmat"		}, /* 440 */
-	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 441 */
-	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 442 */
-	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 443 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 440 */
+	{ 4,	TI,	sys_shmat,		"shmat"		}, /* 441 */
+	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 442 */
+	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 443 */
+	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 444 */
--- a/linux/microblaze/ioctlent.h.in
+++ b/linux/microblaze/ioctlent.h.in
@ -0,0 +1 @@
+#include "../i386/ioctlent.h.in"
--- a/linux/microblaze/syscallent.h
+++ b/linux/microblaze/syscallent.h
@ -0,0 +1,407 @@
+/*
+ * Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
+ * Copyright (c) 1993, 1994, 1995 Rick Sladkey <jrs@world.std.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+	{ 0,	0,	sys_restart_syscall,	"restart_syscall" }, /* 0 */
+	{ 1,	TP,	sys_exit,		"_exit"		}, /* 1 */
+	{ 0,	TP,	sys_fork,		"fork"		}, /* 2 */
+	{ 3,	0,	sys_read,		"read"		}, /* 3 */
+	{ 3,	0,	sys_write,		"write"		}, /* 4 */
+	{ 3,	TF,	sys_open,		"open"		}, /* 5 */
+	{ 1,	0,	sys_close,		"close"		}, /* 6 */
+	{ 3,	TP,	sys_waitpid,		"waitpid"	}, /* 7 */
+	{ 2,	TF,	sys_creat,		"creat"		}, /* 8 */
+	{ 2,	TF,	sys_link,		"link"		}, /* 9 */
+	{ 1,	TF,	sys_unlink,		"unlink"	}, /* 10 */
+	{ 3,	TF|TP,	sys_execve,		"execve"	}, /* 11 */
+	{ 1,	TF,	sys_chdir,		"chdir"		}, /* 12 */
+	{ 1,	0,	sys_time,		"time"		}, /* 13 */
+	{ 3,	TF,	sys_mknod,		"mknod"		}, /* 14 */
+	{ 2,	TF,	sys_chmod,		"chmod"		}, /* 15 */
+	{ 3,	TF,	sys_chown,		"lchown"	}, /* 16 */
+	{ 0,	0,	sys_break,		"break"		}, /* 17 */
+	{ 2,	TF,	sys_oldstat,		"oldstat"	}, /* 18 */
+	{ 3,	0,	sys_lseek,		"lseek"		}, /* 19 */
+	{ 0,	0,	sys_getpid,		"getpid"	}, /* 20 */
+	{ 5,	TF,	sys_mount,		"mount"		}, /* 21 */
+	{ 1,	TF,	sys_umount,		"oldumount"	}, /* 22 */
+	{ 1,	0,	sys_setuid,		"setuid"	}, /* 23 */
+	{ 0,	NF,	sys_getuid,		"getuid"	}, /* 24 */
+	{ 1,	0,	sys_stime,		"stime"		}, /* 25 */
+	{ 4,	0,	sys_ptrace,		"ptrace"	}, /* 26 */
+	{ 1,	0,	sys_alarm,		"alarm"		}, /* 27 */
+	{ 2,	0,	sys_oldfstat,		"oldfstat"	}, /* 28 */
+	{ 0,	TS,	sys_pause,		"pause"		}, /* 29 */
+	{ 2,	TF,	sys_utime,		"utime"		}, /* 30 */
+	{ 2,	0,	sys_stty,		"stty"		}, /* 31 */
+	{ 2,	0,	sys_gtty,		"gtty"		}, /* 32 */
+	{ 2,	TF,	sys_access,		"access"	}, /* 33 */
+	{ 1,	0,	sys_nice,		"nice"		}, /* 34 */
+	{ 0,	0,	sys_ftime,		"ftime"		}, /* 35 */
+	{ 0,	0,	sys_sync,		"sync"		}, /* 36 */
+	{ 2,	TS,	sys_kill,		"kill"		}, /* 37 */
+	{ 2,	TF,	sys_rename,		"rename"	}, /* 38 */
+	{ 2,	TF,	sys_mkdir,		"mkdir"		}, /* 39 */
+	{ 1,	TF,	sys_rmdir,		"rmdir"		}, /* 40 */
+	{ 1,	0,	sys_dup,		"dup"		}, /* 41 */
+	{ 1,	0,	sys_pipe,		"pipe"		}, /* 42 */
+	{ 1,	0,	sys_times,		"times"		}, /* 43 */
+	{ 0,	0,	sys_prof,		"prof"		}, /* 44 */
+	{ 1,	0,	sys_brk,		"brk"		}, /* 45 */
+	{ 1,	0,	sys_setgid,		"setgid"	}, /* 46 */
+	{ 0,	NF,	sys_getgid,		"getgid"	}, /* 47 */
+	{ 3,	TS,	sys_signal,		"signal"	}, /* 48 */
+	{ 0,	NF,	sys_geteuid,		"geteuid"	}, /* 49 */
+	{ 0,	NF,	sys_getegid,		"getegid"	}, /* 50 */
+	{ 1,	TF,	sys_acct,		"acct"		}, /* 51 */
+	{ 2,	TF,	sys_umount2,		"umount"	}, /* 52 */
+	{ 0,	0,	sys_lock,		"lock"		}, /* 53 */
+	{ 3,	0,	sys_ioctl,		"ioctl"		}, /* 54 */
+	{ 3,	0,	sys_fcntl,		"fcntl"		}, /* 55 */
+	{ 0,	0,	sys_mpx,		"mpx"		}, /* 56 */
+	{ 2,	0,	sys_setpgid,		"setpgid"	}, /* 57 */
+	{ 2,	0,	sys_ulimit,		"ulimit"	}, /* 58 */
+	{ 1,	0,	sys_oldolduname,	"oldolduname"	}, /* 59 */
+	{ 1,	0,	sys_umask,		"umask"		}, /* 60 */
+	{ 1,	TF,	sys_chroot,		"chroot"	}, /* 61 */
+	{ 2,	0,	sys_ustat,		"ustat"		}, /* 62 */
+	{ 2,	0,	sys_dup2,		"dup2"		}, /* 63 */
+	{ 0,	0,	sys_getppid,		"getppid"	}, /* 64 */
+	{ 0,	0,	sys_getpgrp,		"getpgrp"	}, /* 65 */
+	{ 0,	0,	sys_setsid,		"setsid"	}, /* 66 */
+	{ 3,	TS,	sys_sigaction,		"sigaction"	}, /* 67 */
+	{ 0,	TS,	sys_siggetmask,		"sgetmask"	}, /* 68 */
+	{ 1,	TS,	sys_sigsetmask,		"ssetmask"	}, /* 69 */
+	{ 2,	0,	sys_setreuid,		"setreuid"	}, /* 70 */
+	{ 2,	0,	sys_setregid,		"setregid"	}, /* 71 */
+	{ 3,	TS,	sys_sigsuspend,		"sigsuspend"	}, /* 72 */
+	{ 1,	TS,	sys_sigpending,		"sigpending"	}, /* 73 */
+	{ 2,	0,	sys_sethostname,	"sethostname"	}, /* 74 */
+	{ 2,	0,	sys_setrlimit,		"setrlimit"	}, /* 75 */
+	{ 2,	0,	sys_getrlimit,		"old_getrlimit"	}, /* 76 */
+	{ 2,	0,	sys_getrusage,		"getrusage"	}, /* 77 */
+	{ 2,	0,	sys_gettimeofday,	"gettimeofday"	}, /* 78 */
+	{ 2,	0,	sys_settimeofday,	"settimeofday"	}, /* 79 */
+	{ 2,	0,	sys_getgroups,		"getgroups"	}, /* 80 */
+	{ 2,	0,	sys_setgroups,		"setgroups"	}, /* 81 */
+	{ 1,	0,	sys_oldselect,		"oldselect"	}, /* 82 */
+	{ 2,	TF,	sys_symlink,		"symlink"	}, /* 83 */
+	{ 2,	TF,	sys_oldlstat,		"oldlstat"	}, /* 84 */
+	{ 3,	TF,	sys_readlink,		"readlink"	}, /* 85 */
+	{ 1,	TF,	sys_uselib,		"uselib"	}, /* 86 */
+	{ 2,	TF,	sys_swapon,		"swapon"	}, /* 87 */
+	{ 4,	0,	sys_reboot,		"reboot"	}, /* 88 */
+	{ 3,	0,	sys_readdir,		"readdir"	}, /* 89 */
+	{ 6,	TD,	sys_old_mmap,		"old_mmap"	}, /* 90 */
+	{ 2,	0,	sys_munmap,		"munmap"	}, /* 91 */
+	{ 2,	TF,	sys_truncate,		"truncate"	}, /* 92 */
+	{ 2,	0,	sys_ftruncate,		"ftruncate"	}, /* 93 */
+	{ 2,	0,	sys_fchmod,		"fchmod"	}, /* 94 */
+	{ 3,	0,	sys_fchown,		"fchown"	}, /* 95 */
+	{ 2,	0,	sys_getpriority,	"getpriority"	}, /* 96 */
+	{ 3,	0,	sys_setpriority,	"setpriority"	}, /* 97 */
+	{ 4,	0,	sys_profil,		"profil"	}, /* 98 */
+	{ 2,	TF,	sys_statfs,		"statfs"	}, /* 99 */
+	{ 2,	0,	sys_fstatfs,		"fstatfs"	}, /* 100 */
+	{ 3,	0,	sys_ioperm,		"ioperm"	}, /* 101 */
+	{ 2,	0,	sys_socketcall,		"socketcall"	}, /* 102 */
+	{ 3,	0,	sys_syslog,		"syslog"	}, /* 103 */
+	{ 3,	0,	sys_setitimer,		"setitimer"	}, /* 104 */
+	{ 2,	0,	sys_getitimer,		"getitimer"	}, /* 105 */
+	{ 2,	TF,	sys_stat,		"stat"		}, /* 106 */
+	{ 2,	TF,	sys_lstat,		"lstat"		}, /* 107 */
+	{ 2,	0,	sys_fstat,		"fstat"		}, /* 108 */
+	{ 1,	0,	sys_olduname,		"olduname"	}, /* 109 */
+	{ 1,	0,	sys_iopl,		"iopl"		}, /* 110 */
+	{ 0,	0,	sys_vhangup,		"vhangup"	}, /* 111 */
+	{ 0,	0,	sys_idle,		"idle"		}, /* 112 */
+	{ 1,	0,	sys_vm86old,		"vm86old"	}, /* 113 */
+	{ 4,	TP,	sys_wait4,		"wait4"		}, /* 114 */
+	{ 1,	TF,	sys_swapoff,		"swapoff"	}, /* 115 */
+	{ 1,	0,	sys_sysinfo,		"sysinfo"	}, /* 116 */
+	{ 6,	TI,	sys_ipc,		"ipc"		}, /* 117 */
+	{ 1,	TD,	sys_fsync,		"fsync"		}, /* 118 */
+	{ 0,	TS,	sys_sigreturn,		"sigreturn"	}, /* 119 */
+	{ 5,	TP,	sys_clone,		"clone"		}, /* 120 */
+	{ 2,	0,	sys_setdomainname,	"setdomainname"	}, /* 121 */
+	{ 1,	0,	sys_uname,		"uname"		}, /* 122 */
+	{ 3,	0,	sys_modify_ldt,		"modify_ldt"	}, /* 123 */
+	{ 1,	0,	sys_adjtimex,		"adjtimex"	}, /* 124 */
+	{ 3,	0,	sys_mprotect,		"mprotect"	}, /* 125 */
+	{ 3,	TS,	sys_sigprocmask,	"sigprocmask"	}, /* 126 */
+	{ 2,	0,	sys_create_module,	"create_module"	}, /* 127 */
+	{ 3,	0,	sys_init_module,	"init_module"	}, /* 128 */
+	{ 2,	0,	sys_delete_module,	"delete_module"	}, /* 129 */
+	{ 1,	0,	sys_get_kernel_syms,	"get_kernel_syms"}, /* 130 */
+	{ 4,	0,	sys_quotactl,		"quotactl"	}, /* 131 */
+	{ 1,	0,	sys_getpgid,		"getpgid"	}, /* 132 */
+	{ 1,	0,	sys_fchdir,		"fchdir"	}, /* 133 */
+	{ 0,	0,	sys_bdflush,		"bdflush"	}, /* 134 */
+	{ 3,	0,	sys_sysfs,		"sysfs"		}, /* 135 */
+	{ 1,	0,	sys_personality,	"personality"	}, /* 136 */
+	{ 5,	0,	sys_afs_syscall,	"afs_syscall"	}, /* 137 */
+	{ 1,	NF,	sys_setfsuid,		"setfsuid"	}, /* 138 */
+	{ 1,	NF,	sys_setfsgid,		"setfsgid"	}, /* 139 */
+	{ 5,	0,	sys_llseek,		"_llseek"	}, /* 140 */
+	{ 3,	0,	sys_getdents,		"getdents"	}, /* 141 */
+	{ 5,	0,	sys_select,		"select"	}, /* 142 */
+	{ 2,	0,	sys_flock,		"flock"		}, /* 143 */
+	{ 3,	0,	sys_msync,		"msync"		}, /* 144 */
+	{ 3,	0,	sys_readv,		"readv"		}, /* 145 */
+	{ 3,	0,	sys_writev,		"writev"	}, /* 146 */
+	{ 1,	0,	sys_getsid,		"getsid"	}, /* 147 */
+	{ 1,	0,	sys_fdatasync,		"fdatasync"	}, /* 148 */
+	{ 1,	0,	sys_sysctl,		"_sysctl"	}, /* 149 */
+	{ 2,	0,	sys_mlock,		"mlock"		}, /* 150 */
+	{ 2,	0,	sys_munlock,		"munlock"	}, /* 151 */
+	{ 1,	0,	sys_mlockall,		"mlockall"	}, /* 152 */
+	{ 0,	0,	sys_munlockall,		"munlockall"	}, /* 153 */
+	{ 0,	0,	sys_sched_setparam,	"sched_setparam"}, /* 154 */
+	{ 2,	0,	sys_sched_getparam,	"sched_getparam"}, /* 155 */
+	{ 3,	0,	sys_sched_setscheduler,	"sched_setscheduler"}, /* 156 */
+	{ 1,	0,	sys_sched_getscheduler,	"sched_getscheduler"}, /* 157 */
+	{ 0,	0,	sys_sched_yield,	"sched_yield"	}, /* 158 */
+	{ 1,	0,	sys_sched_get_priority_max,"sched_get_priority_max"}, /* 159 */
+	{ 1,	0,	sys_sched_get_priority_min,"sched_get_priority_min"}, /* 160 */
+	{ 2,	0,	sys_sched_rr_get_interval,"sched_rr_get_interval"}, /* 161 */
+	{ 2,	0,	sys_nanosleep,		"nanosleep"	}, /* 162 */
+	{ 5,	0,	sys_mremap,		"mremap"	}, /* 163 */
+	{ 3,	0,	sys_setresuid,		"setresuid"	}, /* 164 */
+	{ 3,	0,	sys_getresuid,		"getresuid"	}, /* 165 */
+	{ 5,	0,	sys_vm86,		"vm86"		}, /* 166 */
+	{ 5,	0,	sys_query_module,	"query_module"	}, /* 167 */
+	{ 3,	0,	sys_poll,		"poll"		}, /* 168 */
+	{ 3,	0,	sys_nfsservctl,		"nfsservctl"	}, /* 169 */
+	{ 3,	0,	sys_setresgid,		"setresgid"	}, /* 170 */
+	{ 3,	0,	sys_getresgid,		"getresgid"	}, /* 171 */
+	{ 5,	0,	sys_prctl,		"prctl"		}, /* 172 */
+	{ 0,	TS,	sys_rt_sigreturn,	"rt_sigreturn"	}, /* 173 */
+	{ 4,	TS,	sys_rt_sigaction,	"rt_sigaction"	}, /* 174 */
+	{ 4,	TS,	sys_rt_sigprocmask,	"rt_sigprocmask"}, /* 175 */
+	{ 2,	TS,	sys_rt_sigpending,	"rt_sigpending"	}, /* 176 */
+	{ 4,	TS,	sys_rt_sigtimedwait,	"rt_sigtimedwait"}, /* 177 */
+	{ 3,	TS,	sys_rt_sigqueueinfo,    "rt_sigqueueinfo"}, /* 178 */
+	{ 2,	TS,	sys_rt_sigsuspend,	"rt_sigsuspend"	}, /* 179 */
+	{ 5,	TF,	sys_pread,		"pread64"	}, /* 180 */
+	{ 5,	TF,	sys_pwrite,		"pwrite64"	}, /* 181 */
+	{ 3,	TF,	sys_chown,		"chown"		}, /* 182 */
+	{ 2,	TF,	sys_getcwd,		"getcwd"	}, /* 183 */
+	{ 2,	0,	sys_capget,		"capget"	}, /* 184 */
+	{ 2,	0,	sys_capset,		"capset"	}, /* 185 */
+	{ 2,	TS,	sys_sigaltstack,	"sigaltstack"	}, /* 186 */
+	{ 4,	TD|TN,	sys_sendfile,		"sendfile"	}, /* 187 */
+	{ 5,	0,	sys_getpmsg,		"getpmsg"	}, /* 188 */
+	{ 5,	0,	sys_putpmsg,		"putpmsg"	}, /* 189 */
+	{ 0,	TP,	sys_vfork,		"vfork"		}, /* 190 */
+	{ 2,	0,	sys_getrlimit,		"getrlimit"	}, /* 191 */
+	{ 6,	TD,	sys_mmap,		"mmap2"		}, /* 192 */
+	{ 3,	TF,	sys_truncate64,		"truncate64"	}, /* 193 */
+	{ 3,	TF,	sys_ftruncate64,	"ftruncate64"	}, /* 194 */
+	{ 2,	TF,	sys_stat64,		"stat64"	}, /* 195 */
+	{ 2,	TF,	sys_lstat64,		"lstat64"	}, /* 196 */
+	{ 2,	TF,	sys_fstat64,		"fstat64"	}, /* 197 */
+	{ 3,	TF,	sys_chown,		"lchown32"	}, /* 198 */
+	{ 0,	NF,	sys_getuid,		"getuid32"	}, /* 199 */
+	{ 0,	NF,	sys_getgid,		"getgid32"	}, /* 200 */
+	{ 0,	NF,	sys_geteuid,		"geteuid32"	}, /* 201 */
+	{ 0,	NF,	sys_geteuid,		"getegid32"	}, /* 202 */
+	{ 2,	0,	sys_setreuid,		"setreuid32"	}, /* 203 */
+	{ 2,	0,	sys_setregid,		"setregid32"	}, /* 204 */
+	{ 2,	0,	sys_getgroups32,	"getgroups32"	}, /* 205 */
+	{ 2,	0,	sys_setgroups32,	"setgroups32"	}, /* 206 */
+	{ 3,	0,	sys_fchown,		"fchown32"	}, /* 207 */
+	{ 3,	0,	sys_setresuid,		"setresuid32"	}, /* 208 */
+	{ 3,	0,	sys_getresuid,		"getresuid32"	}, /* 209 */
+	{ 3,	0,	sys_setresgid,		"setresgid32"	}, /* 210 */
+	{ 3,	0,	sys_getresgid,		"getresgid32"	}, /* 211 */
+	{ 3,	TF,	sys_chown,		"chown32"	}, /* 212 */
+	{ 1,	0,	sys_setuid,		"setuid32"	}, /* 213 */
+	{ 1,	0,	sys_setgid,		"setgid32"	}, /* 214 */
+	{ 1,	NF,	sys_setfsuid,		"setfsuid32"	}, /* 215 */
+	{ 1,	NF,	sys_setfsgid,		"setfsgid32"	}, /* 216 */
+	{ 2,	TF,	sys_pivotroot,		"pivot_root"	}, /* 217 */
+	{ 3,	0,	sys_mincore,		"mincore"	}, /* 218 */
+	{ 3,	0,	sys_madvise,		"madvise"	}, /* 219 */
+	{ 3,	TD,	sys_getdents64,		"getdents64"	}, /* 220 */
+	{ 3,	0,	sys_fcntl,		"fcntl64"	}, /* 221 */
+	{ 4,	0,	NULL,			NULL		}, /* 222 */
+	{ 4,	0,	NULL,			NULL		}, /* 223 */
+	{ 0,	0,	sys_gettid,		"gettid"	}, /* 224 */
+	{ 4,	0,	sys_readahead,		"readahead"	}, /* 225 */
+	{ 5,	TF,	sys_setxattr,		"setxattr"	}, /* 226 */
+	{ 5,	TF,	sys_setxattr,		"lsetxattr"	}, /* 227 */
+	{ 5,	0,	sys_fsetxattr,		"fsetxattr"	}, /* 228 */
+	{ 4,	TF,	sys_getxattr,		"getxattr"	}, /* 229 */
+	{ 4,	TF,	sys_getxattr,		"lgetxattr"	}, /* 230 */
+	{ 4,	TD,	sys_fgetxattr,		"fgetxattr"	}, /* 231 */
+	{ 3,	TF,	sys_listxattr,		"listxattr"	}, /* 232 */
+	{ 3,	TF,	sys_listxattr,		"llistxattr"	}, /* 233 */
+	{ 3,	TD,	sys_flistxattr,		"flistxattr"	}, /* 234 */
+	{ 2,	TF,	sys_removexattr,	"removexattr"	}, /* 235 */
+	{ 2,	TF,	sys_removexattr,	"lremovexattr"	}, /* 236 */
+	{ 2,	TD,	sys_fremovexattr,	"fremovexattr"	}, /* 237 */
+	{ 2,	TS,	sys_kill,		"tkill"		}, /* 238 */
+	{ 4,	TD|TN,	sys_sendfile64,		"sendfile64"	}, /* 239 */
+	{ 6,	0,	sys_futex,		"futex"		}, /* 240 */
+	{ 3,	0,	sys_sched_setaffinity,	"sched_setaffinity"}, /* 241 */
+	{ 3,	0,	sys_sched_getaffinity,	"sched_getaffinity"}, /* 242 */
+	{ 1,	0,	sys_set_thread_area,	"set_thread_area"}, /* 243 */
+	{ 1,	0,	sys_get_thread_area,	"get_thread_area"}, /* 244 */
+	{ 2,	0,	sys_io_setup,		"io_setup"	}, /* 245 */
+	{ 1,	0,	sys_io_destroy,		"io_destroy"	}, /* 246 */
+	{ 5,	0,	sys_io_getevents,	"io_getevents"	}, /* 247 */
+	{ 3,	0,	sys_io_submit,		"io_submit"	}, /* 248 */
+	{ 3,	0,	sys_io_cancel,		"io_cancel"	}, /* 249 */
+	{ 5,	TD,	sys_fadvise64,		"fadvise64"	}, /* 250 */
+	{ 0,	0,	NULL,			NULL		}, /* 251 */
+	{ 1,	TP,	sys_exit,		"exit_group"	}, /* 252 */
+	{ 4,	0,	sys_lookup_dcookie,	"lookup_dcookie"}, /* 253 */
+	{ 1,	TD,	sys_epoll_create,	"epoll_create"	}, /* 254 */
+	{ 4,	TD,	sys_epoll_ctl,		"epoll_ctl"	}, /* 255 */
+	{ 4,	TD,	sys_epoll_wait,		"epoll_wait"	}, /* 256 */
+	{ 5,	0,	sys_remap_file_pages,	"remap_file_pages"}, /* 257 */
+	{ 1,	0,	sys_set_tid_address,	"set_tid_address"}, /* 258 */
+	{ 3,	0,	sys_timer_create,	"timer_create"	}, /* 259 */
+	{ 4,	0,	sys_timer_settime,	"timer_settime"	}, /* 260 */
+	{ 2,	0,	sys_timer_gettime,	"timer_gettime"	}, /* 261 */
+	{ 1,	0,	sys_timer_getoverrun,	"timer_getoverrun"}, /* 262 */
+	{ 1,	0,	sys_timer_delete,	"timer_delete"	}, /* 263 */
+	{ 2,	0,	sys_clock_settime,	"clock_settime"	}, /* 264 */
+	{ 2,	0,	sys_clock_gettime,	"clock_gettime"	}, /* 265 */
+	{ 2,	0,	sys_clock_getres,	"clock_getres"	}, /* 266 */
+	{ 4,	0,	sys_clock_nanosleep,	"clock_nanosleep"}, /* 267 */
+	{ 3,	TF,	sys_statfs64,		"statfs64"	}, /* 268 */
+	{ 2,	TD,	sys_fstatfs64,		"fstatfs64"	}, /* 269 */
+	{ 3,	TS,	sys_tgkill,		"tgkill"	}, /* 270 */
+	{ 2,	TF,	sys_utimes,		"utimes"	}, /* 271 */
+	{ 6,	TD,	sys_fadvise64_64,	"fadvise64_64"	}, /* 272 */
+	{ 5,	0,	sys_vserver,		"vserver"	}, /* 273 */
+	{ 4,	0,	sys_mbind,		"mbind"		}, /* 274 */
+	{ 5,	0,	sys_get_mempolicy,	"get_mempolicy"	}, /* 275 */
+	{ 3,	0,	sys_set_mempolicy,	"set_mempolicy"	}, /* 276 */
+	{ 4,	0,	sys_mq_open,		"mq_open"	}, /* 277 */
+	{ 1,	0,	sys_mq_unlink,		"mq_unlink"	}, /* 278 */
+	{ 5,	0,	sys_mq_timedsend,	"mq_timedsend"	}, /* 279 */
+	{ 5,	0,	sys_mq_timedreceive,	"mq_timedreceive"}, /* 280 */
+	{ 2,	0,	sys_mq_notify,		"mq_notify"	}, /* 281 */
+	{ 3,	0,	sys_mq_getsetattr,	"mq_getsetattr"	}, /* 282 */
+	{ 4,	0,	sys_kexec_load,		"kexec_load"	}, /* 283 */
+	{ 5,	TP,	sys_waitid,		"waitid"	}, /* 284 */
+	{ 5,	0,	NULL,			NULL		}, /* 285 */
+	{ 5,	0,	sys_add_key,		"add_key"	}, /* 286 */
+	{ 4,	0,	sys_request_key,	"request_key"	}, /* 287 */
+	{ 5,	0,	sys_keyctl,		"keyctl"	}, /* 288 */
+	{ 3,	0,	sys_ioprio_set,		"ioprio_set"	}, /* 289 */
+	{ 2,	0,	sys_ioprio_get,		"ioprio_get"	}, /* 290 */
+	{ 0,	TD,	sys_inotify_init,	"inotify_init"	}, /* 291 */
+	{ 3,	TD,	sys_inotify_add_watch,	"inotify_add_watch"	}, /* 292 */
+	{ 2,	TD,	sys_inotify_rm_watch,	"inotify_rm_watch"	}, /* 293 */
+	{ 4,	0,	sys_migrate_pages,	"migrate_pages"	}, /* 294 */
+	{ 4,	TD|TF,	sys_openat,		"openat"	}, /* 295 */
+	{ 3,	TD|TF,	sys_mkdirat,		"mkdirat"	}, /* 296 */
+	{ 4,	TD|TF,	sys_mknodat,		"mknodat"	}, /* 297 */
+	{ 5,	TD|TF,	sys_fchownat,		"fchownat"	}, /* 298 */
+	{ 3,	TD|TF,	sys_futimesat,		"futimesat"	}, /* 299 */
+	{ 4,	TD|TF,	sys_newfstatat,		"fstatat64"	}, /* 300 */
+	{ 3,	TD|TF,	sys_unlinkat,		"unlinkat"	}, /* 301 */
+	{ 4,	TD|TF,	sys_renameat,		"renameat"	}, /* 302 */
+	{ 5,	TD|TF,	sys_linkat,		"linkat"	}, /* 303 */
+	{ 3,	TD|TF,	sys_symlinkat,		"symlinkat"	}, /* 304 */
+	{ 4,	TD|TF,	sys_readlinkat,		"readlinkat"	}, /* 305 */
+	{ 3,	TD|TF,	sys_fchmodat,		"fchmodat"	}, /* 306 */
+	{ 3,	TD|TF,	sys_faccessat,		"faccessat"	}, /* 307 */
+	{ 6,	TD,	sys_pselect6,		"pselect6"	}, /* 308 */
+	{ 5,	TD,	sys_ppoll,		"ppoll"		}, /* 309 */
+	{ 1,	TP,	sys_unshare,		"unshare"	}, /* 310 */
+	{ 2,	0,	sys_set_robust_list,	"set_robust_list"	}, /* 311 */
+	{ 3,	0,	sys_get_robust_list,	"get_robust_list"	}, /* 312 */
+	{ 6,	TD,	sys_splice,		"splice"	}, /* 313 */
+	{ 4,	TD,	sys_sync_file_range,	"sync_file_range"}, /* 314 */
+	{ 4,	TD,	sys_tee,		"tee"		}, /* 315 */
+	{ 5,	TD,	sys_vmsplice,		"vmsplice"	}, /* 316 */
+	{ 6,	0,	sys_move_pages,		"move_pages"	}, /* 317 */
+	{ 3,	0,	sys_getcpu,		"getcpu"	}, /* 318 */
+	{ 6,	TD,	sys_epoll_pwait,	"epoll_pwait"	}, /* 319 */
+	{ 4,	TD|TF,	sys_utimensat,		"utimensat"	}, /* 320 */
+	{ 3,	TD|TS,	sys_signalfd,		"signalfd"	}, /* 321 */
+	{ 2,	TD,	sys_timerfd_create,	"timerfd_create"	}, /* 322 */
+	{ 1,	TD,	sys_eventfd,		"eventfd"	}, /* 323 */
+	{ 6,	0,	printargs,		"fallocate"	}, /* 324 */
+	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 325 */
+	{ 4,	TD,	sys_timerfd_settime,	"timerfd_settime"	}, /* 326 */
+	{ 2,	TD,	sys_timerfd_gettime,	"timerfd_gettime"	}, /* 327 */
+	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 328 */
+	{ 4,	TI,	sys_semget,		"semget"	}, /* 329 */
+	{ 4,	TI,	sys_semop,		"semop"		}, /* 330 */
+	{ 4,	TI,	sys_msgctl,		"msgctl"	}, /* 331 */
+	{ 4,	TI,	sys_msgget,		"msgget"	}, /* 332 */
+	{ 4,	TI,	sys_msgrcv,		"msgrcv"	}, /* 333 */
+	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 334 */
+	{ 4,	TI,	sys_shmat,		"shmat"		}, /* 335 */
+	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 336 */
+	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 337 */
+	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 338 */
+	{ 4,	TD|TS,	printargs,		"signalfd4"	}, /* 339 */
+	{ 2,	TD,	printargs,		"eventfd2"	}, /* 340 */
+	{ 1,	TD,	printargs,		"epoll_create1"	}, /* 341 */
+	{ 3,	TD,	printargs,		"dup3"		}, /* 342 */
+	{ 2,	TD,	printargs,		"pipe2"		}, /* 343 */
+	{ 1,	TD,	printargs,		"inotify_init1"	}, /* 344 */
+	{ 3,	TN,	sys_socket,		"socket"	}, /* 345 */
+	{ 4,	TN,	sys_socketpair,		"socketpair"	}, /* 346 */
+	{ 3,	TN,	sys_bind,		"bind"		}, /* 347 */
+	{ 2,	TN,	sys_listen,		"listen"	}, /* 348 */
+	{ 3,	TN,	sys_accept,		"accept"	}, /* 349 */
+	{ 3,	TN,	sys_connect,		"connect"	}, /* 350 */
+	{ 3,	TN,	sys_getsockname,	"getsockname"	}, /* 351 */
+	{ 3,	TN,	sys_getpeername,	"getpeername"	}, /* 352 */
+	{ 6,	TN,	sys_sendto,		"sendto"	}, /* 353 */
+	{ 4,	TN,	sys_send,		"send"		}, /* 354 */
+	{ 6,	TN,	sys_recvfrom,		"recvfrom"	}, /* 355 */
+	{ 4,	TN,	sys_recv,		"recv"		}, /* 356 */
+	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 357 */
+	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 358 */
+	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 359 */
+	{ 3,	TN,	sys_sendmsg,		"sendmsg"	}, /* 360 */
+	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 361 */
+	{ 4,	TN,	sys_accept4,		"accept4"	}, /* 362 */
+	{ 5,	TD,	sys_preadv,		"preadv"	}, /* 363 */
+	{ 5,	TD,	sys_pwritev,		"pwritev"	}, /* 364 */
+	{ 4,	TP|TS,	sys_rt_tgsigqueueinfo,	"rt_tgsigqueueinfo"	}, /* 365 */
+	{ 5,	TN,	sys_perf_event_open,	"perf_event_open"	}, /* 366 */
+	{ 5,	TN,	printargs,		"recvmmsg"	}, /* 367 */
+	{ 2,	TD,	sys_fanotify_init,	"fanotify_init"	}, /* 368 */
+	{ 5,	TD|TF,	sys_fanotify_mark,	"fanotify_mark"	}, /* 369 */
+	{ 4,	0,	sys_prlimit64,		"prlimit64"	}, /* 370 */
+	{ 5,	TD|TF,	sys_name_to_handle_at,	"name_to_handle_at"}, /* 371 */
+	{ 3,	TD,	sys_open_by_handle_at,	"open_by_handle_at"}, /* 372 */
+	{ 2,	0,	sys_clock_adjtime,	"clock_adjtime"	}, /* 373 */
+	{ 1,	TD,	sys_syncfs,		"syncfs"	}, /* 374 */
+	{ 2,	TD,	sys_setns,		"setns"		}, /* 375 */
+	{ 4,	TN,	sys_sendmmsg,		"sendmmsg"	}, /* 376 */
+	{ 6,	0,	sys_process_vm_readv,	"process_vm_readv"	}, /* 377 */
+	{ 6,	0,	sys_process_vm_writev,	"process_vm_writev"	}, /* 378 */
--- a/linux/mips/.cvsignore
+++ b/linux/mips/.cvsignore
@ -1 +0,0 @@
-Makefile
--- a/linux/mips/ioctlent.h
+++ b/linux/mips/ioctlent.h
@ -1,838 +0,0 @@
-	{"linux/fs.h",	"FIBMAP",	0x1},
-	{"linux/fs.h",	"FIGETBSZ",	0x2},
-	{"linux/fd.h",	"FDGETPRM",	0x204},
-	{"linux/fd.h",	"FDGETMAXERRS",	0x20e},
-	{"linux/fd.h",	"FDGETDRVTYP",	0x20f},
-	{"linux/fd.h",	"FDGETDRVPRM",	0x211},
-	{"linux/fd.h",	"FDGETDRVSTAT",	0x212},
-	{"linux/fd.h",	"FDPOLLDRVSTAT",	0x213},
-	{"linux/fd.h",	"FDGETFDCSTAT",	0x215},
-	{"linux/fd.h",	"FDWERRORGET",	0x217},
-	{"linux/fd.h",	"FDCLRPRM",	0x241},
-	{"linux/fd.h",	"FDSETPRM",	0x242},
-	{"linux/fd.h",	"FDDEFPRM",	0x243},
-	{"linux/fd.h",	"FDMSGON",	0x245},
-	{"linux/fd.h",	"FDMSGOFF",	0x246},
-	{"linux/fd.h",	"FDFMTBEG",	0x247},
-	{"linux/fd.h",	"FDFMTTRK",	0x248},
-	{"linux/fd.h",	"FDFMTEND",	0x249},
-	{"linux/fd.h",	"FDSETEMSGTRESH",	0x24a},
-	{"linux/fd.h",	"FDFLUSH",	0x24b},
-	{"linux/fd.h",	"FDSETMAXERRS",	0x24c},
-	{"linux/fd.h",	"FDRESET",	0x254},
-	{"linux/fd.h",	"FDWERRORCLR",	0x256},
-	{"linux/fd.h",	"FDRAWCMD",	0x258},
-	{"linux/fd.h",	"FDTWADDLE",	0x259},
-	{"linux/fd.h",	"FDEJECT",	0x25a},
-	{"linux/fd.h",	"FDSETDRVPRM",	0x290},
-	{"linux/umsdos_fs.h",	"UMSDOS_READDIR_DOS",	0x4d2},
-	{"linux/umsdos_fs.h",	"UMSDOS_UNLINK_DOS",	0x4d3},
-	{"linux/umsdos_fs.h",	"UMSDOS_RMDIR_DOS",	0x4d4},
-	{"linux/umsdos_fs.h",	"UMSDOS_STAT_DOS",	0x4d5},
-	{"linux/umsdos_fs.h",	"UMSDOS_CREAT_EMD",	0x4d6},
-	{"linux/umsdos_fs.h",	"UMSDOS_UNLINK_EMD",	0x4d7},
-	{"linux/umsdos_fs.h",	"UMSDOS_READDIR_EMD",	0x4d8},
-	{"linux/umsdos_fs.h",	"UMSDOS_GETVERSION",	0x4d9},
-	{"linux/umsdos_fs.h",	"UMSDOS_INIT_EMD",	0x4da},
-	{"linux/umsdos_fs.h",	"UMSDOS_DOS_SETUP",	0x4db},
-	{"linux/umsdos_fs.h",	"UMSDOS_RENAME_DOS",	0x4dc},
-	{"linux/fs.h",	"BLKROSET",	0x125d},
-	{"linux/fs.h",	"BLKROGET",	0x125e},
-	{"linux/fs.h",	"BLKRRPART",	0x125f},
-	{"linux/fs.h",	"BLKGETSIZE",	0x1260},
-	{"linux/fs.h",	"BLKFLSBUF",	0x1261},
-	{"linux/fs.h",	"BLKRASET",	0x1262},
-	{"linux/fs.h",	"BLKRAGET",	0x1263},
-	{"linux/fs.h",	"BLKFRASET",	0x1264},
-	{"linux/fs.h",	"BLKFRAGET",	0x1265},
-	{"linux/fs.h",	"BLKSECTSET",	0x1266},
-	{"linux/fs.h",	"BLKSECTGET",	0x1267},
-	{"linux/fs.h",	"BLKSSZGET",	0x1268},
-	{"linux/blkpg.h",	"BLKPG",	0x1269},
-	{"linux/fs.h",	"BLKPG",	0x1269},
-	{"linux/elevator.h",	"BLKELVGET",	0x126a},
-	{"linux/fs.h",	"BLKELVGET",	0x126a},
-	{"linux/elevator.h",	"BLKELVSET",	0x126b},
-	{"linux/fs.h",	"BLKELVSET",	0x126b},
-	{"linux/fs.h",	"BLKBSZGET",	0x1270},
-	{"linux/fs.h",	"BLKBSZSET",	0x1271},
-	{"linux/fs.h",	"BLKGETSIZE64",	0x1272},
-	{"linux/agpgart.h",	"AGPIOC_INFO",	0x4100},
-	{"linux/agpgart.h",	"AGPIOC_ACQUIRE",	0x4101},
-	{"linux/apm_bios.h",	"APM_IOC_STANDBY",	0x4101},
-	{"linux/agpgart.h",	"AGPIOC_RELEASE",	0x4102},
-	{"linux/apm_bios.h",	"APM_IOC_SUSPEND",	0x4102},
-	{"linux/agpgart.h",	"AGPIOC_SETUP",	0x4103},
-	{"linux/agpgart.h",	"AGPIOC_RESERVE",	0x4104},
-	{"linux/agpgart.h",	"AGPIOC_PROTECT",	0x4105},
-	{"linux/agpgart.h",	"AGPIOC_ALLOCATE",	0x4106},
-	{"linux/agpgart.h",	"AGPIOC_DEALLOCATE",	0x4107},
-	{"linux/agpgart.h",	"AGPIOC_BIND",	0x4108},
-	{"linux/agpgart.h",	"AGPIOC_UNBIND",	0x4109},
-	{"linux/pmu.h",	"PMU_IOC_SLEEP",	0x4200},
-	{"linux/cciss_ioctl.h",	"CCISS_GETPCIINFO",	0x4201},
-	{"linux/pmu.h",	"PMU_IOC_GET_BACKLIGHT",	0x4201},
-	{"linux/cciss_ioctl.h",	"CCISS_GETINTINFO",	0x4202},
-	{"linux/pmu.h",	"PMU_IOC_SET_BACKLIGHT",	0x4202},
-	{"linux/cciss_ioctl.h",	"CCISS_SETINTINFO",	0x4203},
-	{"linux/pmu.h",	"PMU_IOC_GET_MODEL",	0x4203},
-	{"linux/cciss_ioctl.h",	"CCISS_GETNODENAME",	0x4204},
-	{"linux/pmu.h",	"PMU_IOC_HAS_ADB",	0x4204},
-	{"linux/cciss_ioctl.h",	"CCISS_SETNODENAME",	0x4205},
-	{"linux/pmu.h",	"PMU_IOC_CAN_SLEEP",	0x4205},
-	{"linux/cciss_ioctl.h",	"CCISS_GETHEARTBEAT",	0x4206},
-	{"linux/cciss_ioctl.h",	"CCISS_GETBUSTYPES",	0x4207},
-	{"linux/cciss_ioctl.h",	"CCISS_GETFIRMVER",	0x4208},
-	{"linux/cciss_ioctl.h",	"CCISS_GETDRIVVER",	0x4209},
-	{"linux/cciss_ioctl.h",	"CCISS_REVALIDVOLS",	0x420a},
-	{"linux/cciss_ioctl.h",	"CCISS_PASSTHRU",	0x420b},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RESET",	0x4300},
-	{"linux/capi.h",	"CAPI_REGISTER",	0x4301},
-	{"linux/soundcard.h",	"SNDCTL_COPR_LOAD",	0x4301},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RDATA",	0x4302},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RCODE",	0x4303},
-	{"linux/soundcard.h",	"SNDCTL_COPR_WDATA",	0x4304},
-	{"linux/soundcard.h",	"SNDCTL_COPR_WCODE",	0x4305},
-	{"linux/capi.h",	"CAPI_GET_MANUFACTURER",	0x4306},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RUN",	0x4306},
-	{"linux/capi.h",	"CAPI_GET_VERSION",	0x4307},
-	{"linux/soundcard.h",	"SNDCTL_COPR_HALT",	0x4307},
-	{"linux/capi.h",	"CAPI_GET_SERIAL",	0x4308},
-	{"linux/soundcard.h",	"SNDCTL_COPR_SENDMSG",	0x4308},
-	{"linux/capi.h",	"CAPI_GET_PROFILE",	0x4309},
-	{"linux/soundcard.h",	"SNDCTL_COPR_RCVMSG",	0x4309},
-	{"linux/capi.h",	"CAPI_MANUFACTURER_CMD",	0x4320},
-	{"linux/capi.h",	"CAPI_GET_ERRCODE",	0x4321},
-	{"linux/capi.h",	"CAPI_INSTALLED",	0x4322},
-	{"linux/capi.h",	"CAPI_GET_FLAGS",	0x4323},
-	{"linux/capi.h",	"CAPI_SET_FLAGS",	0x4324},
-	{"linux/capi.h",	"CAPI_CLR_FLAGS",	0x4325},
-	{"linux/capi.h",	"CAPI_NCCI_OPENCOUNT",	0x4326},
-	{"linux/capi.h",	"CAPI_NCCI_GETUNIT",	0x4327},
-	{"linux/input.h",	"EVIOCGVERSION",	0x4501},
-	{"linux/input.h",	"EVIOCGID",	0x4502},
-	{"linux/input.h",	"EVIOCGREP",	0x4503},
-	{"linux/input.h",	"EVIOCSREP",	0x4503},
-	{"linux/input.h",	"EVIOCGKEYCODE",	0x4504},
-	{"linux/input.h",	"EVIOCSKEYCODE",	0x4504},
-	{"linux/input.h",	"EVIOCGKEY",	0x4505},
-	{"linux/input.h",	"EVIOCGBUS",	0x4507},
-	{"linux/input.h",	"EVIOCRMFF",	0x4581},
-	{"linux/input.h",	"EVIOCSGAIN",	0x4582},
-	{"linux/input.h",	"EVIOCSAUTOCENTER",	0x4583},
-	{"linux/input.h",	"EVIOCGEFFECTS",	0x4584},
-	{"linux/fb.h",	"FBIOGET_VBLANK",	0x4612},
-	{"linux/hiddev.h",	"HIDIOCGVERSION",	0x4801},
-	{"linux/hiddev.h",	"HIDIOCAPPLICATION",	0x4802},
-	{"linux/hiddev.h",	"HIDIOCGDEVINFO",	0x4803},
-	{"linux/hiddev.h",	"HIDIOCGSTRING",	0x4804},
-	{"linux/hiddev.h",	"HIDIOCINITREPORT",	0x4805},
-	{"linux/hiddev.h",	"HIDIOCGREPORT",	0x4807},
-	{"linux/hiddev.h",	"HIDIOCSREPORT",	0x4808},
-	{"linux/hiddev.h",	"HIDIOCGREPORTINFO",	0x4809},
-	{"linux/hiddev.h",	"HIDIOCGFIELDINFO",	0x480a},
-	{"linux/hiddev.h",	"HIDIOCGUSAGE",	0x480b},
-	{"linux/hiddev.h",	"HIDIOCSUSAGE",	0x480c},
-	{"linux/hiddev.h",	"HIDIOCGUCODE",	0x480d},
-	{"linux/isdn.h",	"IIOCNETAIF",	0x4901},
-	{"linux/isdn.h",	"IIOCNETDIF",	0x4902},
-	{"linux/isdn.h",	"IIOCNETSCF",	0x4903},
-	{"linux/isdn.h",	"IIOCNETGCF",	0x4904},
-	{"linux/isdn.h",	"IIOCNETANM",	0x4905},
-	{"linux/isdn.h",	"IIOCNETDNM",	0x4906},
-	{"linux/isdn.h",	"IIOCNETGNM",	0x4907},
-	{"linux/isdn.h",	"IIOCGETSET",	0x4908},
-	{"linux/isdn.h",	"IIOCSETSET",	0x4909},
-	{"linux/isdn.h",	"IIOCSETVER",	0x490a},
-	{"linux/isdn.h",	"IIOCNETHUP",	0x490b},
-	{"linux/isdn.h",	"IIOCSETGST",	0x490c},
-	{"linux/isdn.h",	"IIOCSETBRJ",	0x490d},
-	{"linux/isdn.h",	"IIOCSIGPRF",	0x490e},
-	{"linux/isdn.h",	"IIOCGETPRF",	0x490f},
-	{"linux/isdn.h",	"IIOCSETPRF",	0x4910},
-	{"linux/isdn.h",	"IIOCGETMAP",	0x4911},
-	{"linux/isdn.h",	"IIOCSETMAP",	0x4912},
-	{"linux/isdn.h",	"IIOCNETASL",	0x4913},
-	{"linux/isdn.h",	"IIOCNETDIL",	0x4914},
-	{"linux/isdn.h",	"IIOCGETCPS",	0x4915},
-	{"linux/isdn.h",	"IIOCGETDVR",	0x4916},
-	{"linux/isdn.h",	"IIOCNETLCR",	0x4917},
-	{"linux/isdn.h",	"IIOCNETDWRSET",	0x4918},
-	{"linux/isdn.h",	"IIOCNETALN",	0x4920},
-	{"linux/isdn.h",	"IIOCNETDLN",	0x4921},
-	{"linux/isdn.h",	"IIOCNETGPN",	0x4922},
-	{"linux/isdn.h",	"IIOCDBGVAR",	0x497f},
-	{"linux/isdn.h",	"IIOCDRVCTL",	0x4980},
-	{"linux/soundcard.h",	"SOUND_MIXER_INFO",	0x4d65},
-	{"linux/soundcard.h",	"SOUND_OLD_MIXER_INFO",	0x4d65},
-	{"linux/soundcard.h",	"SOUND_MIXER_ACCESS",	0x4d66},
-	{"linux/soundcard.h",	"SOUND_MIXER_AGC",	0x4d67},
-	{"linux/soundcard.h",	"SOUND_MIXER_3DSE",	0x4d68},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE1",	0x4d6f},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE2",	0x4d70},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE3",	0x4d71},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE4",	0x4d72},
-	{"linux/soundcard.h",	"SOUND_MIXER_PRIVATE5",	0x4d73},
-	{"linux/soundcard.h",	"SOUND_MIXER_GETLEVELS",	0x4d74},
-	{"linux/soundcard.h",	"SOUND_MIXER_SETLEVELS",	0x4d75},
-	{"linux/soundcard.h",	"OSS_GETVERSION",	0x4d76},
-	{"linux/soundcard.h",	"SNDCTL_DSP_RESET",	0x5000},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SYNC",	0x5001},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SPEED",	0x5002},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_RATE",	0x5002},
-	{"linux/soundcard.h",	"SNDCTL_DSP_STEREO",	0x5003},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETBLKSIZE",	0x5004},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETFMT",	0x5005},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_BITS",	0x5005},
-	{"linux/soundcard.h",	"SNDCTL_DSP_CHANNELS",	0x5006},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_CHANNELS",	0x5006},
-	{"linux/soundcard.h",	"SOUND_PCM_WRITE_FILTER",	0x5007},
-	{"linux/soundcard.h",	"SOUND_PCM_READ_FILTER",	0x5007},
-	{"linux/soundcard.h",	"SNDCTL_DSP_POST",	0x5008},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SUBDIVIDE",	0x5009},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETFRAGMENT",	0x500a},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETFMTS",	0x500b},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETOSPACE",	0x500c},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETISPACE",	0x500d},
-	{"linux/soundcard.h",	"SNDCTL_DSP_NONBLOCK",	0x500e},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETCAPS",	0x500f},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETTRIGGER",	0x5010},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETTRIGGER",	0x5010},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETIPTR",	0x5011},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETOPTR",	0x5012},
-	{"linux/soundcard.h",	"SNDCTL_DSP_MAPINBUF",	0x5013},
-	{"linux/soundcard.h",	"SNDCTL_DSP_MAPOUTBUF",	0x5014},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETSYNCRO",	0x5015},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETDUPLEX",	0x5016},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETODELAY",	0x5017},
-	{"linux/soundcard.h",	"SNDCTL_DSP_PROFILE",	0x5017},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETCHANNELMASK",	0x5040},
-	{"linux/soundcard.h",	"SNDCTL_DSP_BIND_CHANNEL",	0x5041},
-	{"linux/soundcard.h",	"SNDCTL_DSP_SETSPDIF",	0x5042},
-	{"linux/soundcard.h",	"SNDCTL_DSP_GETSPDIF",	0x5043},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_RESET",	0x5100},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_SYNC",	0x5101},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_INFO",	0x5102},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_CTRLRATE",	0x5103},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_GETOUTCOUNT",	0x5104},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_GETINCOUNT",	0x5105},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_PERCMODE",	0x5106},
-	{"linux/soundcard.h",	"SNDCTL_FM_LOAD_INSTR",	0x5107},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_TESTMIDI",	0x5108},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_RESETSAMPLES",	0x5109},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_NRSYNTHS",	0x510a},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_NRMIDIS",	0x510b},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_INFO",	0x510c},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_THRESHOLD",	0x510d},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_MEMAVL",	0x510e},
-	{"linux/soundcard.h",	"SNDCTL_FM_4OP_ENABLE",	0x510f},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_PANIC",	0x5111},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_OUTOFBAND",	0x5112},
-	{"linux/soundcard.h",	"SNDCTL_SEQ_GETTIME",	0x5113},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_ID",	0x5114},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_CONTROL",	0x5115},
-	{"linux/soundcard.h",	"SNDCTL_SYNTH_REMOVESAMPLE",	0x5116},
-	{"linux/random.h",	"RNDGETENTCNT",	0x5200},
-	{"linux/random.h",	"RNDADDTOENTCNT",	0x5201},
-	{"linux/random.h",	"RNDGETPOOL",	0x5202},
-	{"linux/random.h",	"RNDADDENTROPY",	0x5203},
-	{"linux/random.h",	"RNDZAPENTCNT",	0x5204},
-	{"linux/random.h",	"RNDCLEARPOOL",	0x5206},
-	{"asm/ioctls.h",	"TCGETS",	0x5401},
-	{"linux/soundcard.h",	"SNDCTL_TMR_TIMEBASE",	0x5401},
-	{"asm/ioctls.h",	"TCSETS",	0x5402},
-	{"linux/soundcard.h",	"SNDCTL_TMR_START",	0x5402},
-	{"asm/ioctls.h",	"TCSETSW",	0x5403},
-	{"linux/soundcard.h",	"SNDCTL_TMR_STOP",	0x5403},
-	{"asm/ioctls.h",	"TCSETSF",	0x5404},
-	{"linux/soundcard.h",	"SNDCTL_TMR_CONTINUE",	0x5404},
-	{"asm/ioctls.h",	"TCGETA",	0x5405},
-	{"linux/soundcard.h",	"SNDCTL_TMR_TEMPO",	0x5405},
-	{"asm/ioctls.h",	"TCSETA",	0x5406},
-	{"linux/soundcard.h",	"SNDCTL_TMR_SOURCE",	0x5406},
-	{"asm/ioctls.h",	"TCSETAW",	0x5407},
-	{"linux/soundcard.h",	"SNDCTL_TMR_METRONOME",	0x5407},
-	{"asm/ioctls.h",	"TCSETAF",	0x5408},
-	{"linux/soundcard.h",	"SNDCTL_TMR_SELECT",	0x5408},
-	{"asm/ioctls.h",	"TCSBRK",	0x5409},
-	{"asm/ioctls.h",	"TCXONC",	0x540a},
-	{"asm/ioctls.h",	"TCFLSH",	0x540b},
-	{"asm/ioctls.h",	"TIOCEXCL",	0x540c},
-	{"asm/ioctls.h",	"TIOCNXCL",	0x540d},
-	{"asm/ioctls.h",	"TIOCSCTTY",	0x540e},
-	{"asm/ioctls.h",	"TIOCGPGRP",	0x540f},
-	{"asm/ioctls.h",	"TIOCSPGRP",	0x5410},
-	{"asm/ioctls.h",	"TIOCOUTQ",	0x5411},
-	{"asm/ioctls.h",	"TIOCSTI",	0x5412},
-	{"asm/ioctls.h",	"TIOCGWINSZ",	0x5413},
-	{"asm/ioctls.h",	"TIOCSWINSZ",	0x5414},
-	{"asm/ioctls.h",	"TIOCMGET",	0x5415},
-	{"asm/ioctls.h",	"TIOCMBIS",	0x5416},
-	{"asm/ioctls.h",	"TIOCMBIC",	0x5417},
-	{"asm/ioctls.h",	"TIOCMSET",	0x5418},
-	{"asm/ioctls.h",	"TIOCGSOFTCAR",	0x5419},
-	{"asm/ioctls.h",	"TIOCSSOFTCAR",	0x541a},
-	{"asm/ioctls.h",	"FIONREAD",	0x541b},
-	{"asm/ioctls.h",	"TIOCLINUX",	0x541c},
-	{"asm/ioctls.h",	"TIOCCONS",	0x541d},
-	{"asm/ioctls.h",	"TIOCGSERIAL",	0x541e},
-	{"asm/ioctls.h",	"TIOCSSERIAL",	0x541f},
-	{"asm/ioctls.h",	"TIOCPKT",	0x5420},
-	{"asm/ioctls.h",	"FIONBIO",	0x5421},
-	{"asm/ioctls.h",	"TIOCNOTTY",	0x5422},
-	{"asm/ioctls.h",	"TIOCSETD",	0x5423},
-	{"asm/ioctls.h",	"TIOCGETD",	0x5424},
-	{"asm/ioctls.h",	"TCSBRKP",	0x5425},
-	{"asm/ioctls.h",	"TIOCTTYGSTRUCT",	0x5426},
-	{"asm/ioctls.h",	"TIOCSBRK",	0x5427},
-	{"asm/ioctls.h",	"TIOCCBRK",	0x5428},
-	{"asm/ioctls.h",	"TIOCGSID",	0x5429},
-	{"asm/ioctls.h",	"TIOCGPTN",	0x5430},
-	{"asm/ioctls.h",	"TIOCSPTLCK",	0x5431},
-	{"asm/ioctls.h",	"FIONCLEX",	0x5450},
-	{"asm/ioctls.h",	"FIOCLEX",	0x5451},
-	{"asm/ioctls.h",	"FIOASYNC",	0x5452},
-	{"asm/ioctls.h",	"TIOCSERCONFIG",	0x5453},
-	{"asm/ioctls.h",	"TIOCSERGWILD",	0x5454},
-	{"asm/ioctls.h",	"TIOCSERSWILD",	0x5455},
-	{"asm/ioctls.h",	"TIOCGLCKTRMIOS",	0x5456},
-	{"asm/ioctls.h",	"TIOCSLCKTRMIOS",	0x5457},
-	{"asm/ioctls.h",	"TIOCSERGSTRUCT",	0x5458},
-	{"asm/ioctls.h",	"TIOCSERGETLSR",	0x5459},
-	{"asm/ioctls.h",	"TIOCSERGETMULTI",	0x545a},
-	{"asm/ioctls.h",	"TIOCSERSETMULTI",	0x545b},
-	{"asm/ioctls.h",	"TIOCMIWAIT",	0x545c},
-	{"asm/ioctls.h",	"TIOCGICOUNT",	0x545d},
-	{"asm/ioctls.h",	"TIOCGHAYESESP",	0x545e},
-	{"asm/ioctls.h",	"TIOCSHAYESESP",	0x545f},
-	{"linux/if_tun.h",	"TUNSETNOCSUM",	0x54c8},
-	{"linux/if_tun.h",	"TUNSETDEBUG",	0x54c9},
-	{"linux/if_tun.h",	"TUNSETIFF",	0x54ca},
-	{"linux/if_tun.h",	"TUNSETPERSIST",	0x54cb},
-	{"linux/if_tun.h",	"TUNSETOWNER",	0x54cc},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CONTROL",	0x5500},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_BULK",	0x5502},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_RESETEP",	0x5503},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_SETINTERFACE",	0x5504},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_SETCONFIGURATION",	0x5505},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_GETDRIVER",	0x5508},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_SUBMITURB",	0x550a},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_DISCARDURB",	0x550b},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_REAPURB",	0x550c},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_REAPURBNDELAY",	0x550d},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_DISCSIGNAL",	0x550e},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CLAIMINTERFACE",	0x550f},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_RELEASEINTERFACE",	0x5510},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CONNECTINFO",	0x5511},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_IOCTL",	0x5512},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_HUB_PORTINFO",	0x5513},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_RESET",	0x5514},
-	{"linux/usbdevice_fs.h",	"USBDEVFS_CLEAR_HALT",	0x5515},
-	{"linux/watchdog.h",	"WDIOC_GETSUPPORT",	0x5700},
-	{"linux/watchdog.h",	"WDIOC_GETSTATUS",	0x5701},
-	{"linux/watchdog.h",	"WDIOC_GETBOOTSTATUS",	0x5702},
-	{"linux/watchdog.h",	"WDIOC_GETTEMP",	0x5703},
-	{"linux/watchdog.h",	"WDIOC_SETOPTIONS",	0x5704},
-	{"linux/watchdog.h",	"WDIOC_KEEPALIVE",	0x5705},
-	{"linux/watchdog.h",	"WDIOC_SETTIMEOUT",	0x5706},
-	{"linux/watchdog.h",	"WDIOC_GETTIMEOUT",	0x5707},
-	{"linux/ite_gpio.h",	"ITE_GPIO_IN",	0x5a00},
-	{"linux/ite_gpio.h",	"ITE_GPIO_OUT",	0x5a01},
-	{"linux/ite_gpio.h",	"ITE_GPIO_INT_CTRL",	0x5a02},
-	{"linux/ite_gpio.h",	"ITE_GPIO_IN_STATUS",	0x5a03},
-	{"linux/ite_gpio.h",	"ITE_GPIO_OUT_STATUS",	0x5a04},
-	{"linux/ite_gpio.h",	"ITE_GPIO_GEN_CTRL",	0x5a05},
-	{"linux/ite_gpio.h",	"ITE_GPIO_INT_WAIT",	0x5a06},
-	{"linux/sonet.h",	"SONET_GETSTAT",	0x6110},
-	{"linux/sonet.h",	"SONET_GETSTATZ",	0x6111},
-	{"linux/sonet.h",	"SONET_SETDIAG",	0x6112},
-	{"linux/sonet.h",	"SONET_CLRDIAG",	0x6113},
-	{"linux/sonet.h",	"SONET_GETDIAG",	0x6114},
-	{"linux/sonet.h",	"SONET_SETFRAMING",	0x6115},
-	{"linux/sonet.h",	"SONET_GETFRAMING",	0x6116},
-	{"linux/sonet.h",	"SONET_GETFRSENSE",	0x6117},
-	{"linux/atm_idt77105.h",	"IDT77105_GETSTAT",	0x6132},
-	{"linux/atm_idt77105.h",	"IDT77105_GETSTATZ",	0x6133},
-	{"linux/atmdev.h",	"ATM_GETSTAT",	0x6150},
-	{"linux/atmdev.h",	"ATM_GETSTATZ",	0x6151},
-	{"linux/atmdev.h",	"ATM_GETLOOP",	0x6152},
-	{"linux/atmdev.h",	"ATM_SETLOOP",	0x6153},
-	{"linux/atmdev.h",	"ATM_QUERYLOOP",	0x6154},
-	{"linux/atm_eni.h",	"ENI_MEMDUMP",	0x6160},
-	{"linux/atm_nicstar.h",	"NS_GETPSTAT",	0x6161},
-	{"linux/atm_zatm.h",	"ZATM_GETPOOL",	0x6161},
-	{"linux/atm_nicstar.h",	"NS_SETBUFLEV",	0x6162},
-	{"linux/atm_zatm.h",	"ZATM_GETPOOLZ",	0x6162},
-	{"linux/atm_nicstar.h",	"NS_ADJBUFLEV",	0x6163},
-	{"linux/atm_zatm.h",	"ZATM_SETPOOL",	0x6163},
-	{"linux/atm_zatm.h",	"ZATM_GETTHIST",	0x6164},
-	{"linux/atm_eni.h",	"ENI_SETMULT",	0x6167},
-	{"linux/atm_tcp.h",	"SIOCSIFATMTCP",	0x6180},
-	{"linux/atmdev.h",	"ATM_GETLINKRATE",	0x6181},
-	{"linux/atmdev.h",	"ATM_GETNAMES",	0x6183},
-	{"linux/atmdev.h",	"ATM_GETTYPE",	0x6184},
-	{"linux/atmdev.h",	"ATM_GETESI",	0x6185},
-	{"linux/atmdev.h",	"ATM_GETADDR",	0x6186},
-	{"linux/atmdev.h",	"ATM_RSTADDR",	0x6187},
-	{"linux/atmdev.h",	"ATM_ADDADDR",	0x6188},
-	{"linux/atmdev.h",	"ATM_DELADDR",	0x6189},
-	{"linux/atmdev.h",	"ATM_GETCIRANGE",	0x618a},
-	{"linux/atmdev.h",	"ATM_SETCIRANGE",	0x618b},
-	{"linux/atmdev.h",	"ATM_SETESI",	0x618c},
-	{"linux/atmdev.h",	"ATM_SETESIF",	0x618d},
-	{"linux/atm_tcp.h",	"ATMTCP_CREATE",	0x618e},
-	{"linux/atm_tcp.h",	"ATMTCP_REMOVE",	0x618f},
-	{"linux/atmlec.h",	"ATMLEC_CTRL",	0x61d0},
-	{"linux/atmlec.h",	"ATMLEC_DATA",	0x61d1},
-	{"linux/atmlec.h",	"ATMLEC_MCAST",	0x61d2},
-	{"linux/atmmpc.h",	"ATMMPC_CTRL",	0x61d8},
-	{"linux/atmmpc.h",	"ATMMPC_DATA",	0x61d9},
-	{"linux/atmclip.h",	"SIOCMKCLIP",	0x61e0},
-	{"linux/atmarp.h",	"ATMARPD_CTRL",	0x61e1},
-	{"linux/atmarp.h",	"ATMARP_MKIP",	0x61e2},
-	{"linux/atmarp.h",	"ATMARP_SETENTRY",	0x61e3},
-	{"linux/atmarp.h",	"ATMARP_ENCAP",	0x61e5},
-	{"linux/atmsvc.h",	"ATMSIGD_CTRL",	0x61f0},
-	{"linux/atmdev.h",	"ATM_SETSC",	0x61f1},
-	{"linux/atmdev.h",	"ATM_SETBACKEND",	0x61f2},
-	{"linux/coda.h",	"CIOC_KERNEL_VERSION",	0x630a},
-	{"linux/comstats.h",	"COM_GETPORTSTATS",	0x631e},
-	{"linux/comstats.h",	"COM_CLRPORTSTATS",	0x631f},
-	{"linux/comstats.h",	"COM_GETBRDSTATS",	0x6320},
-	{"linux/comstats.h",	"COM_READPORT",	0x6328},
-	{"linux/comstats.h",	"COM_READBOARD",	0x6329},
-	{"linux/comstats.h",	"COM_READPANEL",	0x632a},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_GET_PROTO_REV",	0x6400},
-	{"linux/video_decoder.h",	"DECODER_GET_CAPABILITIES",	0x6401},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_SET_EVENT_MASK",	0x6402},
-	{"linux/video_decoder.h",	"DECODER_GET_STATUS",	0x6402},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_RELEASE_EVENT_QUEUE",	0x6403},
-	{"linux/video_decoder.h",	"DECODER_SET_NORM",	0x6403},
-	{"linux/devfs_fs.h",	"DEVFSDIOC_SET_DEBUG_MASK",	0x6404},
-	{"linux/video_decoder.h",	"DECODER_SET_INPUT",	0x6404},
-	{"linux/video_decoder.h",	"DECODER_SET_OUTPUT",	0x6405},
-	{"linux/video_decoder.h",	"DECODER_ENABLE_OUTPUT",	0x6406},
-	{"linux/video_decoder.h",	"DECODER_SET_PICTURE",	0x6407},
-	{"linux/video_decoder.h",	"DECODER_DUMP",	0x64c0},
-	{"linux/video_encoder.h",	"ENCODER_GET_CAPABILITIES",	0x6501},
-	{"linux/video_encoder.h",	"ENCODER_SET_NORM",	0x6502},
-	{"linux/video_encoder.h",	"ENCODER_SET_INPUT",	0x6503},
-	{"linux/video_encoder.h",	"ENCODER_SET_OUTPUT",	0x6504},
-	{"linux/video_encoder.h",	"ENCODER_ENABLE_OUTPUT",	0x6505},
-	{"linux/ext2_fs.h",	"EXT2_IOC_GETFLAGS",	0x6601},
-	{"linux/ext3_fs.h",	"EXT3_IOC_GETFLAGS",	0x6601},
-	{"linux/ext2_fs.h",	"EXT2_IOC_SETFLAGS",	0x6602},
-	{"linux/ext3_fs.h",	"EXT3_IOC_SETFLAGS",	0x6602},
-	{"linux/ext3_fs.h",	"EXT3_IOC_GETVERSION",	0x6603},
-	{"linux/ext3_fs.h",	"EXT3_IOC_SETVERSION",	0x6604},
-	{"linux/ext3_fs.h",	"EXT3_IOC_WAIT_FOR_READONLY",	0x6663},
-	{"linux/i2o-dev.h",	"I2OGETIOPS",	0x6900},
-	{"linux/i2o-dev.h",	"I2OHRTGET",	0x6901},
-	{"linux/i2o-dev.h",	"I2OLCTGET",	0x6902},
-	{"linux/i2o-dev.h",	"I2OPARMSET",	0x6903},
-	{"linux/i2o-dev.h",	"I2OPARMGET",	0x6904},
-	{"linux/i2o-dev.h",	"I2OSWDL",	0x6905},
-	{"linux/i2o-dev.h",	"I2OSWUL",	0x6906},
-	{"linux/i2o-dev.h",	"I2OSWDEL",	0x6907},
-	{"linux/i2o-dev.h",	"I2OVALIDATE",	0x6908},
-	{"linux/i2o-dev.h",	"I2OHTML",	0x6909},
-	{"linux/i2o-dev.h",	"I2OEVTREG",	0x690a},
-	{"linux/i2o-dev.h",	"I2OEVTGET",	0x690b},
-	{"linux/i8k.h",	"I8K_BIOS_VERSION",	0x6980},
-	{"linux/i8k.h",	"I8K_MACHINE_ID",	0x6981},
-	{"linux/i8k.h",	"I8K_POWER_STATUS",	0x6982},
-	{"linux/i8k.h",	"I8K_FN_STATUS",	0x6983},
-	{"linux/i8k.h",	"I8K_GET_TEMP",	0x6984},
-	{"linux/i8k.h",	"I8K_GET_SPEED",	0x6985},
-	{"linux/i8k.h",	"I8K_GET_FAN",	0x6986},
-	{"linux/i8k.h",	"I8K_SET_FAN",	0x6987},
-	{"linux/joystick.h",	"JSIOCGVERSION",	0x6a01},
-	{"linux/joystick.h",	"JSIOCGAXES",	0x6a11},
-	{"linux/joystick.h",	"JSIOCGBUTTONS",	0x6a12},
-	{"linux/joystick.h",	"JSIOCSCORR",	0x6a21},
-	{"linux/joystick.h",	"JSIOCGCORR",	0x6a22},
-	{"linux/joystick.h",	"JSIOCSAXMAP",	0x6a31},
-	{"linux/joystick.h",	"JSIOCGAXMAP",	0x6a32},
-	{"linux/joystick.h",	"JSIOCSBTNMAP",	0x6a33},
-	{"linux/joystick.h",	"JSIOCGBTNMAP",	0x6a34},
-	{"linux/udf_fs_i.h",	"UDF_GETEASIZE",	0x6c40},
-	{"linux/udf_fs_i.h",	"UDF_GETEABLOCK",	0x6c41},
-	{"linux/udf_fs_i.h",	"UDF_GETVOLIDENT",	0x6c42},
-	{"linux/udf_fs_i.h",	"UDF_RELOCATE_BLOCKS",	0x6c43},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_PRETIME",	0x6d00},
-	{"linux/synclink.h",	"MGSL_IOCSPARAMS",	0x6d00},
-	{"linux/mtio.h",	"MTIOCTOP",	0x6d01},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_MPUMODE",	0x6d01},
-	{"linux/synclink.h",	"MGSL_IOCGPARAMS",	0x6d01},
-	{"linux/mtio.h",	"MTIOCGET",	0x6d02},
-	{"linux/soundcard.h",	"SNDCTL_MIDI_MPUCMD",	0x6d02},
-	{"linux/synclink.h",	"MGSL_IOCSTXIDLE",	0x6d02},
-	{"linux/mtio.h",	"MTIOCPOS",	0x6d03},
-	{"linux/synclink.h",	"MGSL_IOCGTXIDLE",	0x6d03},
-	{"linux/mtio.h",	"MTIOCGETCONFIG",	0x6d04},
-	{"linux/synclink.h",	"MGSL_IOCTXENABLE",	0x6d04},
-	{"linux/mtio.h",	"MTIOCSETCONFIG",	0x6d05},
-	{"linux/synclink.h",	"MGSL_IOCRXENABLE",	0x6d05},
-	{"linux/mtio.h",	"MTIOCRDFTSEG",	0x6d06},
-	{"linux/synclink.h",	"MGSL_IOCTXABORT",	0x6d06},
-	{"linux/mtio.h",	"MTIOCWRFTSEG",	0x6d07},
-	{"linux/synclink.h",	"MGSL_IOCGSTATS",	0x6d07},
-	{"linux/mtio.h",	"MTIOCVOLINFO",	0x6d08},
-	{"linux/synclink.h",	"MGSL_IOCWAITEVENT",	0x6d08},
-	{"linux/mtio.h",	"MTIOCGETSIZE",	0x6d09},
-	{"linux/synclink.h",	"MGSL_IOCLOOPTXDONE",	0x6d09},
-	{"linux/mtio.h",	"MTIOCFTFORMAT",	0x6d0a},
-	{"linux/mtio.h",	"MTIOCFTCMD",	0x6d0b},
-	{"linux/synclink.h",	"MGSL_IOCCLRMODCOUNT",	0x6d0f},
-	{"linux/zftape.h",	"MTIOC_ZFTAPE_GETBLKSZ",	0x6d68},
-	{"linux/ncp_fs.h",	"NCP_IOC_NCPREQUEST",	0x6e01},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETMOUNTUID",	0x6e02},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETMOUNTUID2",	0x6e02},
-	{"linux/ncp_fs.h",	"NCP_IOC_CONN_LOGGED_IN",	0x6e03},
-	{"linux/ncp_fs.h",	"NCP_IOC_GET_FS_INFO",	0x6e04},
-	{"linux/ncp_fs.h",	"NCP_IOC_GET_FS_INFO_V2",	0x6e04},
-	{"linux/ncp_fs.h",	"NCP_IOC_SIGN_INIT",	0x6e05},
-	{"linux/ncp_fs.h",	"NCP_IOC_SIGN_WANTED",	0x6e06},
-	{"linux/ncp_fs.h",	"NCP_IOC_SET_SIGN_WANTED",	0x6e06},
-	{"linux/ncp_fs.h",	"NCP_IOC_LOCKUNLOCK",	0x6e07},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETROOT",	0x6e08},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETROOT",	0x6e08},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETOBJECTNAME",	0x6e09},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETOBJECTNAME",	0x6e09},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETPRIVATEDATA",	0x6e0a},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETPRIVATEDATA",	0x6e0a},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETCHARSETS",	0x6e0b},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETCHARSETS",	0x6e0b},
-	{"linux/ncp_fs.h",	"NCP_IOC_GETDENTRYTTL",	0x6e0c},
-	{"linux/ncp_fs.h",	"NCP_IOC_SETDENTRYTTL",	0x6e0c},
-	{"linux/matroxfb.h",	"MATROXFB_SET_OUTPUT_CONNECTION",	0x6ef8},
-	{"linux/matroxfb.h",	"MATROXFB_GET_OUTPUT_CONNECTION",	0x6ef8},
-	{"linux/matroxfb.h",	"MATROXFB_GET_AVAILABLE_OUTPUTS",	0x6ef9},
-	{"linux/matroxfb.h",	"MATROXFB_SET_OUTPUT_MODE",	0x6efa},
-	{"linux/matroxfb.h",	"MATROXFB_GET_OUTPUT_MODE",	0x6efa},
-	{"linux/matroxfb.h",	"MATROXFB_GET_ALL_OUTPUTS",	0x6efb},
-	{"linux/rtc.h",	"RTC_AIE_ON",	0x7001},
-	{"linux/rtc.h",	"RTC_AIE_OFF",	0x7002},
-	{"linux/intermezzo_fs.h",	"PRESTO_GETMOUNT",	0x7003},
-	{"linux/rtc.h",	"RTC_UIE_ON",	0x7003},
-	{"linux/intermezzo_fs.h",	"PRESTO_SETPID",	0x7004},
-	{"linux/rtc.h",	"RTC_UIE_OFF",	0x7004},
-	{"linux/rtc.h",	"RTC_PIE_ON",	0x7005},
-	{"linux/intermezzo_fs.h",	"PRESTO_CLOSE_JOURNALF",	0x7006},
-	{"linux/rtc.h",	"RTC_PIE_OFF",	0x7006},
-	{"linux/intermezzo_fs.h",	"PRESTO_SET_FSETROOT",	0x7007},
-	{"linux/rtc.h",	"RTC_ALM_SET",	0x7007},
-	{"linux/intermezzo_fs.h",	"PRESTO_CLEAR_FSETROOT",	0x7008},
-	{"linux/rtc.h",	"RTC_ALM_READ",	0x7008},
-	{"linux/intermezzo_fs.h",	"PRESTO_SETOPT",	0x7009},
-	{"linux/rtc.h",	"RTC_RD_TIME",	0x7009},
-	{"linux/intermezzo_fs.h",	"PRESTO_GETOPT",	0x700a},
-	{"linux/rtc.h",	"RTC_SET_TIME",	0x700a},
-	{"linux/intermezzo_fs.h",	"PRESTO_GET_KMLSIZE",	0x700b},
-	{"linux/rtc.h",	"RTC_IRQP_READ",	0x700b},
-	{"linux/intermezzo_fs.h",	"PRESTO_GET_RECNO",	0x700c},
-	{"linux/rtc.h",	"RTC_IRQP_SET",	0x700c},
-	{"linux/rtc.h",	"RTC_EPOCH_READ",	0x700d},
-	{"linux/rtc.h",	"RTC_EPOCH_SET",	0x700e},
-	{"linux/rtc.h",	"RTC_WIE_ON",	0x700f},
-	{"linux/rtc.h",	"RTC_WKALM_SET",	0x700f},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_SETATTR",	0x7010},
-	{"linux/rtc.h",	"RTC_WIE_OFF",	0x7010},
-	{"linux/rtc.h",	"RTC_WKALM_RD",	0x7010},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_CREATE",	0x7011},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_LINK",	0x7012},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_UNLINK",	0x7013},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_SYMLINK",	0x7014},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_MKDIR",	0x7015},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_RMDIR",	0x7016},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_MKNOD",	0x7017},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_RENAME",	0x7018},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_CLOSE",	0x701a},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_IOPEN",	0x701b},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_SETEXTATTR",	0x701c},
-	{"linux/intermezzo_fs.h",	"PRESTO_VFS_DELEXTATTR",	0x701d},
-	{"linux/intermezzo_fs.h",	"PRESTO_MARK",	0x7020},
-	{"linux/intermezzo_fs.h",	"PRESTO_RELEASE_PERMIT",	0x7021},
-	{"linux/intermezzo_fs.h",	"PRESTO_CLEAR_ALL_FSETROOTS",	0x7022},
-	{"linux/intermezzo_fs.h",	"PRESTO_BACKFETCH_LML",	0x7023},
-	{"linux/intermezzo_fs.h",	"PRESTO_REINT",	0x7024},
-	{"linux/intermezzo_fs.h",	"PRESTO_CANCEL_LML",	0x7025},
-	{"linux/intermezzo_fs.h",	"PRESTO_RESET_FSET",	0x7026},
-	{"linux/intermezzo_fs.h",	"PRESTO_COMPLETE_CLOSES",	0x7027},
-	{"linux/intermezzo_fs.h",	"PRESTO_REINT_BEGIN",	0x7030},
-	{"linux/intermezzo_fs.h",	"PRESTO_DO_REINT",	0x7031},
-	{"linux/intermezzo_fs.h",	"PRESTO_REINT_END",	0x7032},
-	{"linux/nvram.h",	"NVRAM_INIT",	0x7040},
-	{"linux/nvram.h",	"NVRAM_SETCKS",	0x7041},
-	{"linux/ppdev.h",	"PPSETMODE",	0x7080},
-	{"linux/ppdev.h",	"PPRSTATUS",	0x7081},
-	{"linux/ppdev.h",	"PPRCONTROL",	0x7083},
-	{"linux/ppdev.h",	"PPWCONTROL",	0x7084},
-	{"linux/ppdev.h",	"PPRDATA",	0x7085},
-	{"linux/ppdev.h",	"PPWDATA",	0x7086},
-	{"linux/ppdev.h",	"PPCLAIM",	0x708b},
-	{"linux/ppdev.h",	"PPRELEASE",	0x708c},
-	{"linux/ppdev.h",	"PPYIELD",	0x708d},
-	{"linux/ppdev.h",	"PPFCONTROL",	0x708e},
-	{"linux/ppdev.h",	"PPEXCL",	0x708f},
-	{"linux/ppdev.h",	"PPDATADIR",	0x7090},
-	{"linux/ppdev.h",	"PPNEGOT",	0x7091},
-	{"linux/ppdev.h",	"PPWCTLONIRQ",	0x7092},
-	{"linux/ppdev.h",	"PPCLRIRQ",	0x7093},
-	{"linux/ppdev.h",	"PPSETPHASE",	0x7094},
-	{"linux/ppdev.h",	"PPGETTIME",	0x7095},
-	{"linux/ppdev.h",	"PPSETTIME",	0x7096},
-	{"linux/ppdev.h",	"PPGETMODES",	0x7097},
-	{"linux/ppdev.h",	"PPGETMODE",	0x7098},
-	{"linux/ppdev.h",	"PPGETPHASE",	0x7099},
-	{"linux/ppdev.h",	"PPGETFLAGS",	0x709a},
-	{"linux/ppdev.h",	"PPSETFLAGS",	0x709b},
-	{"linux/serio.h",	"SPIOCSTYPE",	0x7101},
-	{"linux/telephony.h",	"PHONE_CAPABILITIES",	0x7180},
-	{"linux/telephony.h",	"PHONE_CAPABILITIES_LIST",	0x7181},
-	{"linux/telephony.h",	"PHONE_CAPABILITIES_CHECK",	0x7182},
-	{"linux/telephony.h",	"PHONE_RING",	0x7183},
-	{"linux/telephony.h",	"PHONE_HOOKSTATE",	0x7184},
-	{"linux/telephony.h",	"PHONE_MAXRINGS",	0x7185},
-	{"linux/telephony.h",	"PHONE_RING_CADENCE",	0x7186},
-	{"linux/telephony.h",	"OLD_PHONE_RING_START",	0x7187},
-	{"linux/telephony.h",	"PHONE_RING_START",	0x7187},
-	{"linux/telephony.h",	"PHONE_RING_STOP",	0x7188},
-	{"linux/telephony.h",	"PHONE_REC_CODEC",	0x7189},
-	{"linux/telephony.h",	"PHONE_REC_START",	0x718a},
-	{"linux/telephony.h",	"PHONE_REC_STOP",	0x718b},
-	{"linux/telephony.h",	"PHONE_REC_DEPTH",	0x718c},
-	{"linux/telephony.h",	"PHONE_FRAME",	0x718d},
-	{"linux/telephony.h",	"PHONE_REC_VOLUME",	0x718e},
-	{"linux/telephony.h",	"PHONE_REC_LEVEL",	0x718f},
-	{"linux/telephony.h",	"PHONE_PLAY_CODEC",	0x7190},
-	{"linux/telephony.h",	"PHONE_PLAY_START",	0x7191},
-	{"linux/telephony.h",	"PHONE_PLAY_STOP",	0x7192},
-	{"linux/telephony.h",	"PHONE_PLAY_DEPTH",	0x7193},
-	{"linux/telephony.h",	"PHONE_PLAY_VOLUME",	0x7194},
-	{"linux/telephony.h",	"PHONE_PLAY_LEVEL",	0x7195},
-	{"linux/telephony.h",	"PHONE_DTMF_READY",	0x7196},
-	{"linux/telephony.h",	"PHONE_GET_DTMF",	0x7197},
-	{"linux/telephony.h",	"PHONE_GET_DTMF_ASCII",	0x7198},
-	{"linux/telephony.h",	"PHONE_DTMF_OOB",	0x7199},
-	{"linux/telephony.h",	"PHONE_EXCEPTION",	0x719a},
-	{"linux/telephony.h",	"PHONE_PLAY_TONE",	0x719b},
-	{"linux/telephony.h",	"PHONE_SET_TONE_ON_TIME",	0x719c},
-	{"linux/telephony.h",	"PHONE_SET_TONE_OFF_TIME",	0x719d},
-	{"linux/telephony.h",	"PHONE_GET_TONE_ON_TIME",	0x719e},
-	{"linux/telephony.h",	"PHONE_GET_TONE_OFF_TIME",	0x719f},
-	{"linux/telephony.h",	"PHONE_GET_TONE_STATE",	0x71a0},
-	{"linux/telephony.h",	"PHONE_BUSY",	0x71a1},
-	{"linux/telephony.h",	"PHONE_RINGBACK",	0x71a2},
-	{"linux/telephony.h",	"PHONE_DIALTONE",	0x71a3},
-	{"linux/telephony.h",	"PHONE_CPT_STOP",	0x71a4},
-	{"linux/telephony.h",	"PHONE_PSTN_SET_STATE",	0x71a4},
-	{"linux/telephony.h",	"PHONE_PSTN_GET_STATE",	0x71a5},
-	{"linux/telephony.h",	"PHONE_WINK_DURATION",	0x71a6},
-	{"linux/telephony.h",	"PHONE_QUERY_CODEC",	0x71a7},
-	{"linux/telephony.h",	"PHONE_PSTN_LINETEST",	0x71a8},
-	{"linux/telephony.h",	"PHONE_VAD",	0x71a9},
-	{"linux/telephony.h",	"PHONE_WINK",	0x71aa},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_RESET",	0x71c0},
-	{"linux/ixjuser.h",	"IXJCTL_CARDTYPE",	0x71c1},
-	{"linux/ixjuser.h",	"IXJCTL_SERIAL",	0x71c2},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_TYPE",	0x71c3},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_VERSION",	0x71c4},
-	{"linux/ixjuser.h",	"IXJCTL_DSP_IDLE",	0x71c5},
-	{"linux/ixjuser.h",	"IXJCTL_TESTRAM",	0x71c6},
-	{"linux/ixjuser.h",	"IXJCTL_SET_FILTER",	0x71c7},
-	{"linux/ixjuser.h",	"IXJCTL_GET_FILTER_HIST",	0x71c8},
-	{"linux/ixjuser.h",	"IXJCTL_INIT_TONE",	0x71c9},
-	{"linux/ixjuser.h",	"IXJCTL_TONE_CADENCE",	0x71ca},
-	{"linux/ixjuser.h",	"IXJCTL_AEC_START",	0x71cb},
-	{"linux/ixjuser.h",	"IXJCTL_AEC_STOP",	0x71cc},
-	{"linux/ixjuser.h",	"IXJCTL_AEC_GET_LEVEL",	0x71cd},
-	{"linux/ixjuser.h",	"IXJCTL_SET_LED",	0x71ce},
-	{"linux/ixjuser.h",	"IXJCTL_MIXER",	0x71cf},
-	{"linux/ixjuser.h",	"IXJCTL_DAA_COEFF_SET",	0x71d0},
-	{"linux/ixjuser.h",	"IXJCTL_PORT",	0x71d1},
-	{"linux/ixjuser.h",	"IXJCTL_DAA_AGAIN",	0x71d2},
-	{"linux/ixjuser.h",	"IXJCTL_PSTN_LINETEST",	0x71d3},
-	{"linux/ixjuser.h",	"IXJCTL_CID",	0x71d4},
-	{"linux/ixjuser.h",	"IXJCTL_POTS_PSTN",	0x71d5},
-	{"linux/ixjuser.h",	"IXJCTL_FILTER_CADENCE",	0x71d6},
-	{"linux/ixjuser.h",	"IXJCTL_PLAY_CID",	0x71d7},
-	{"linux/ixjuser.h",	"IXJCTL_VMWI",	0x71d8},
-	{"linux/ixjuser.h",	"IXJCTL_CIDCW",	0x71d9},
-	{"linux/ixjuser.h",	"IXJCTL_VERSION",	0x71da},
-	{"linux/telephony.h",	"PHONE_REC_VOLUME_LINEAR",	0x71db},
-	{"linux/telephony.h",	"PHONE_PLAY_VOLUME_LINEAR",	0x71dc},
-	{"linux/ixjuser.h",	"IXJCTL_SET_FILTER_RAW",	0x71dd},
-	{"linux/ixjuser.h",	"IXJCTL_HZ",	0x71e0},
-	{"linux/ixjuser.h",	"IXJCTL_RATE",	0x71e1},
-	{"linux/ixjuser.h",	"IXJCTL_FRAMES_READ",	0x71e2},
-	{"linux/ixjuser.h",	"IXJCTL_FRAMES_WRITTEN",	0x71e3},
-	{"linux/ixjuser.h",	"IXJCTL_READ_WAIT",	0x71e4},
-	{"linux/ixjuser.h",	"IXJCTL_WRITE_WAIT",	0x71e5},
-	{"linux/ixjuser.h",	"IXJCTL_DRYBUFFER_READ",	0x71e6},
-	{"linux/ixjuser.h",	"IXJCTL_DRYBUFFER_CLEAR",	0x71e7},
-	{"linux/ixjuser.h",	"IXJCTL_DTMF_PRESCALE",	0x71e8},
-	{"linux/ixjuser.h",	"IXJCTL_SIGCTL",	0x71e9},
-	{"linux/ixjuser.h",	"IXJCTL_SC_RXG",	0x71ea},
-	{"linux/ixjuser.h",	"IXJCTL_SC_TXG",	0x71eb},
-	{"linux/ixjuser.h",	"IXJCTL_INTERCOM_START",	0x71fd},
-	{"linux/ixjuser.h",	"IXJCTL_INTERCOM_STOP",	0x71fe},
-	{"linux/msdos_fs.h",	"VFAT_IOCTL_READDIR_BOTH",	0x7201},
-	{"linux/msdos_fs.h",	"VFAT_IOCTL_READDIR_SHORT",	0x7202},
-	{"linux/cdk.h",	"STL_BINTR",	0x7314},
-	{"linux/cdk.h",	"STL_BSTART",	0x7315},
-	{"linux/cdk.h",	"STL_BSTOP",	0x7316},
-	{"linux/cdk.h",	"STL_BRESET",	0x7317},
-	{"linux/cdk.h",	"STL_GETPFLAG",	0x7350},
-	{"linux/cdk.h",	"STL_SETPFLAG",	0x7351},
-	{"linux/if_ppp.h",	"PPPIOCGCHAN",	0x7437},
-	{"linux/if_ppp.h",	"PPPIOCATTCHAN",	0x7438},
-	{"linux/if_ppp.h",	"PPPIOCDISCONN",	0x7439},
-	{"linux/if_ppp.h",	"PPPIOCCONNECT",	0x743a},
-	{"linux/if_ppp.h",	"PPPIOCSMRRU",	0x743b},
-	{"linux/if_ppp.h",	"PPPIOCDETACH",	0x743c},
-	{"linux/if_ppp.h",	"PPPIOCATTACH",	0x743d},
-	{"linux/if_ppp.h",	"PPPIOCNEWUNIT",	0x743e},
-	{"linux/if_ppp.h",	"PPPIOCGIDLE",	0x743f},
-	{"linux/if_ppp.h",	"PPPIOCSDEBUG",	0x7440},
-	{"linux/if_ppp.h",	"PPPIOCGDEBUG",	0x7441},
-	{"linux/if_ppp.h",	"PPPIOCSACTIVE",	0x7446},
-	{"linux/if_ppp.h",	"PPPIOCSPASS",	0x7447},
-	{"linux/if_ppp.h",	"PPPIOCSNPMODE",	0x744b},
-	{"linux/if_ppp.h",	"PPPIOCGNPMODE",	0x744c},
-	{"linux/if_ppp.h",	"PPPIOCSCOMPRESS",	0x744d},
-	{"linux/if_ppp.h",	"PPPIOCXFERUNIT",	0x744e},
-	{"linux/if_ppp.h",	"PPPIOCSXASYNCMAP",	0x744f},
-	{"linux/if_ppp.h",	"PPPIOCGXASYNCMAP",	0x7450},
-	{"linux/if_ppp.h",	"PPPIOCSMAXCID",	0x7451},
-	{"linux/if_ppp.h",	"PPPIOCSMRU",	0x7452},
-	{"linux/if_ppp.h",	"PPPIOCGMRU",	0x7453},
-	{"linux/if_ppp.h",	"PPPIOCSRASYNCMAP",	0x7454},
-	{"linux/if_ppp.h",	"PPPIOCGRASYNCMAP",	0x7455},
-	{"linux/if_ppp.h",	"PPPIOCGUNIT",	0x7456},
-	{"linux/if_ppp.h",	"PPPIOCSASYNCMAP",	0x7457},
-	{"linux/if_ppp.h",	"PPPIOCGASYNCMAP",	0x7458},
-	{"linux/if_ppp.h",	"PPPIOCSFLAGS",	0x7459},
-	{"linux/if_ppp.h",	"PPPIOCGFLAGS",	0x745a},
-	{"linux/jffs.h",	"JFFS_PRINT_HASH",	0x745a},
-	{"linux/jffs.h",	"JFFS_PRINT_TREE",	0x745b},
-	{"linux/jffs.h",	"JFFS_GET_STATUS",	0x745c},
-	{"linux/isdn_ppp.h",	"PPPIOCGCALLINFO",	0x7480},
-	{"linux/isdn_ppp.h",	"PPPIOCBUNDLE",	0x7481},
-	{"linux/isdn_ppp.h",	"PPPIOCGMPFLAGS",	0x7482},
-	{"linux/isdn_ppp.h",	"PPPIOCSMPFLAGS",	0x7483},
-	{"linux/isdn_ppp.h",	"PPPIOCSMPMTU",	0x7484},
-	{"linux/isdn_ppp.h",	"PPPIOCSMPMRU",	0x7485},
-	{"linux/isdn_ppp.h",	"PPPIOCGCOMPRESSORS",	0x7486},
-	{"linux/isdn_ppp.h",	"PPPIOCSCOMPRESSOR",	0x7487},
-	{"linux/isdn_ppp.h",	"PPPIOCGIFNAME",	0x7488},
-	{"linux/toshiba.h",	"TOSH_SMM",	0x7490},
-	{"linux/smb_fs.h",	"SMB_IOC_GETMOUNTUID",	0x7501},
-	{"linux/smb_fs.h",	"SMB_IOC_NEWCONN",	0x7502},
-	{"linux/smb_fs.h",	"SMB_IOC_GETMOUNTUID32",	0x7503},
-	{"linux/sonypi.h",	"SONYPI_IOCGBRT",	0x7600},
-	{"linux/sonypi.h",	"SONYPI_IOCSBRT",	0x7600},
-	{"linux/ext2_fs.h",	"EXT2_IOC_GETVERSION",	0x7601},
-	{"linux/ext3_fs.h",	"EXT3_IOC_GETVERSION_OLD",	0x7601},
-	{"linux/videodev.h",	"VIDIOCGCAP",	0x7601},
-	{"linux/ext2_fs.h",	"EXT2_IOC_SETVERSION",	0x7602},
-	{"linux/ext3_fs.h",	"EXT3_IOC_SETVERSION_OLD",	0x7602},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT1CAP",	0x7602},
-	{"linux/videodev.h",	"VIDIOCGCHAN",	0x7602},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT1REM",	0x7603},
-	{"linux/videodev.h",	"VIDIOCSCHAN",	0x7603},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT2CAP",	0x7604},
-	{"linux/videodev.h",	"VIDIOCGTUNER",	0x7604},
-	{"linux/sonypi.h",	"SONYPI_IOCGBAT2REM",	0x7605},
-	{"linux/videodev.h",	"VIDIOCSTUNER",	0x7605},
-	{"linux/videodev.h",	"VIDIOCGPICT",	0x7606},
-	{"linux/sonypi.h",	"SONYPI_IOCGBATFLAGS",	0x7607},
-	{"linux/videodev.h",	"VIDIOCSPICT",	0x7607},
-	{"linux/sonypi.h",	"SONYPI_IOCGBLUE",	0x7608},
-	{"linux/videodev.h",	"VIDIOCCAPTURE",	0x7608},
-	{"linux/sonypi.h",	"SONYPI_IOCSBLUE",	0x7609},
-	{"linux/videodev.h",	"VIDIOCGWIN",	0x7609},
-	{"linux/videodev.h",	"VIDIOCSWIN",	0x760a},
-	{"linux/videodev.h",	"VIDIOCGFBUF",	0x760b},
-	{"linux/videodev.h",	"VIDIOCSFBUF",	0x760c},
-	{"linux/videodev.h",	"VIDIOCKEY",	0x760d},
-	{"linux/videodev.h",	"VIDIOCGFREQ",	0x760e},
-	{"linux/videodev.h",	"VIDIOCSFREQ",	0x760f},
-	{"linux/videodev.h",	"VIDIOCGAUDIO",	0x7610},
-	{"linux/videodev.h",	"VIDIOCSAUDIO",	0x7611},
-	{"linux/videodev.h",	"VIDIOCSYNC",	0x7612},
-	{"linux/videodev.h",	"VIDIOCMCAPTURE",	0x7613},
-	{"linux/videodev.h",	"VIDIOCGMBUF",	0x7614},
-	{"linux/videodev.h",	"VIDIOCGUNIT",	0x7615},
-	{"linux/videodev.h",	"VIDIOCGCAPTURE",	0x7616},
-	{"linux/videodev.h",	"VIDIOCSCAPTURE",	0x7617},
-	{"linux/videodev.h",	"VIDIOCSPLAYMODE",	0x7618},
-	{"linux/videodev.h",	"VIDIOCSWRITEMODE",	0x7619},
-	{"linux/videodev.h",	"VIDIOCGPLAYINFO",	0x761a},
-	{"linux/videodev.h",	"VIDIOCSMICROCODE",	0x761b},
-	{"linux/videodev.h",	"VIDIOCGVBIFMT",	0x761c},
-	{"linux/videodev.h",	"VIDIOCSVBIFMT",	0x761d},
-	{"linux/meye.h",	"MEYEIOC_G_PARAMS",	0x76c0},
-	{"linux/meye.h",	"MEYEIOC_S_PARAMS",	0x76c1},
-	{"linux/meye.h",	"MEYEIOC_QBUF_CAPT",	0x76c2},
-	{"linux/meye.h",	"MEYEIOC_SYNC",	0x76c3},
-	{"linux/meye.h",	"MEYEIOC_STILLCAPT",	0x76c4},
-	{"linux/meye.h",	"MEYEIOC_STILLJCAPT",	0x76c5},
-	{"linux/dn.h",	"SIOCSNETADDR",	0x89e0},
-	{"linux/dn.h",	"OSIOCSNETADDR",	0x89e0},
-	{"linux/dn.h",	"SIOCGNETADDR",	0x89e1},
-	{"linux/dn.h",	"OSIOCGNETADDR",	0x89e1},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_READY",	0x9360},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_FAIL",	0x9361},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_CATATONIC",	0x9362},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_PROTOVER",	0x9363},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_SETTIMEOUT",	0x9364},
-	{"linux/auto_fs.h",	"AUTOFS_IOC_EXPIRE",	0x9365},
-	{"linux/auto_fs4.h",	"AUTOFS_IOC_EXPIRE_MULTI",	0x9366},
-	{"linux/nbd.h",	"NBD_SET_SOCK",	0xab00},
-	{"linux/nbd.h",	"NBD_SET_BLKSIZE",	0xab01},
-	{"linux/nbd.h",	"NBD_SET_SIZE",	0xab02},
-	{"linux/nbd.h",	"NBD_DO_IT",	0xab03},
-	{"linux/nbd.h",	"NBD_CLEAR_SOCK",	0xab04},
-	{"linux/nbd.h",	"NBD_CLEAR_QUE",	0xab05},
-	{"linux/nbd.h",	"NBD_PRINT_DEBUG",	0xab06},
-	{"linux/nbd.h",	"NBD_SET_SIZE_BLOCKS",	0xab07},
-	{"linux/nbd.h",	"NBD_DISCONNECT",	0xab08},
-	{"linux/raw.h",	"RAW_SETBIND",	0xac00},
-	{"linux/raw.h",	"RAW_GETBIND",	0xac01},
-	{"linux/if_pppox.h",	"PPPOEIOCSFWD",	0xb100},
-	{"linux/if_pppox.h",	"PPPOEIOCDFWD",	0xb101},
-	{"linux/reiserfs_fs.h",	"REISERFS_IOC_UNPACK",	0xcd01},
-	{"linux/lvm.h",	"VG_CREATE_OLD",	0xfe00},
-	{"linux/lvm.h",	"VG_REMOVE",	0xfe01},
-	{"linux/lvm.h",	"VG_EXTEND",	0xfe03},
-	{"linux/lvm.h",	"VG_REDUCE",	0xfe04},
-	{"linux/lvm.h",	"VG_STATUS",	0xfe05},
-	{"linux/lvm.h",	"VG_STATUS_GET_COUNT",	0xfe06},
-	{"linux/lvm.h",	"VG_STATUS_GET_NAMELIST",	0xfe07},
-	{"linux/lvm.h",	"VG_SET_EXTENDABLE",	0xfe08},
-	{"linux/lvm.h",	"VG_RENAME",	0xfe09},
-	{"linux/lvm.h",	"VG_CREATE",	0xfe0a},
-	{"linux/lvm.h",	"LV_CREATE",	0xfe20},
-	{"linux/lvm.h",	"LV_REMOVE",	0xfe21},
-	{"linux/lvm.h",	"LV_ACTIVATE",	0xfe22},
-	{"linux/lvm.h",	"LV_DEACTIVATE",	0xfe23},
-	{"linux/lvm.h",	"LV_EXTEND",	0xfe24},
-	{"linux/lvm.h",	"LV_REDUCE",	0xfe25},
-	{"linux/lvm.h",	"LV_STATUS_BYNAME",	0xfe26},
-	{"linux/lvm.h",	"LV_STATUS_BYINDEX",	0xfe27},
-	{"linux/lvm.h",	"LV_SET_ACCESS",	0xfe28},
-	{"linux/lvm.h",	"LV_SET_ALLOCATION",	0xfe29},
-	{"linux/lvm.h",	"LV_SET_STATUS",	0xfe2a},
-	{"linux/lvm.h",	"LE_REMAP",	0xfe2b},
-	{"linux/lvm.h",	"LV_SNAPSHOT_USE_RATE",	0xfe2c},
-	{"linux/lvm.h",	"LV_STATUS_BYDEV",	0xfe2e},
-	{"linux/lvm.h",	"LV_RENAME",	0xfe2f},
-	{"linux/lvm.h",	"LV_BMAP",	0xfe30},
-	{"linux/lvm.h",	"PV_STATUS",	0xfe40},
-	{"linux/lvm.h",	"PV_CHANGE",	0xfe41},
-	{"linux/lvm.h",	"PV_FLUSH",	0xfe42},
-	{"linux/lvm.h",	"PE_LOCK_UNLOCK",	0xfe50},
-	{"linux/lvm.h",	"LVM_GET_IOP_VERSION",	0xfe98},
-	{"linux/lvm.h",	"LVM_RESET",	0xfe99},
-	{"linux/lvm.h",	"LVM_LOCK_LVM",	0xff00},
--- a/linux/mips/ioctlent.h.in
+++ b/linux/mips/ioctlent.h.in
@ -0,0 +1,59 @@
+	{"asm/ioctls.h",	"TCGETS",	0x5401},
+	{"asm/ioctls.h",	"TCSETS",	0x5402},
+	{"asm/ioctls.h",	"TCSETSW",	0x5403},
+	{"asm/ioctls.h",	"TCSETSF",	0x5404},
+	{"asm/ioctls.h",	"TCGETA",	0x5405},
+	{"asm/ioctls.h",	"TCSETA",	0x5406},
+	{"asm/ioctls.h",	"TCSETAW",	0x5407},
+	{"asm/ioctls.h",	"TCSETAF",	0x5408},
+	{"asm/ioctls.h",	"TCSBRK",	0x5409},
+	{"asm/ioctls.h",	"TCXONC",	0x540a},
+	{"asm/ioctls.h",	"TCFLSH",	0x540b},
+	{"asm/ioctls.h",	"TIOCEXCL",	0x540c},
+	{"asm/ioctls.h",	"TIOCNXCL",	0x540d},
+	{"asm/ioctls.h",	"TIOCSCTTY",	0x540e},
+	{"asm/ioctls.h",	"TIOCGPGRP",	0x540f},
+	{"asm/ioctls.h",	"TIOCSPGRP",	0x5410},
+	{"asm/ioctls.h",	"TIOCOUTQ",	0x5411},
+	{"asm/ioctls.h",	"TIOCSTI",	0x5412},
+	{"asm/ioctls.h",	"TIOCGWINSZ",	0x5413},
+	{"asm/ioctls.h",	"TIOCSWINSZ",	0x5414},
+	{"asm/ioctls.h",	"TIOCMGET",	0x5415},
+	{"asm/ioctls.h",	"TIOCMBIS",	0x5416},
+	{"asm/ioctls.h",	"TIOCMBIC",	0x5417},
+	{"asm/ioctls.h",	"TIOCMSET",	0x5418},
+	{"asm/ioctls.h",	"TIOCGSOFTCAR",	0x5419},
+	{"asm/ioctls.h",	"TIOCSSOFTCAR",	0x541a},
+	{"asm/ioctls.h",	"FIONREAD",	0x541b},
+	{"asm/ioctls.h",	"TIOCLINUX",	0x541c},
+	{"asm/ioctls.h",	"TIOCCONS",	0x541d},
+	{"asm/ioctls.h",	"TIOCGSERIAL",	0x541e},
+	{"asm/ioctls.h",	"TIOCSSERIAL",	0x541f},
+	{"asm/ioctls.h",	"TIOCPKT",	0x5420},
+	{"asm/ioctls.h",	"FIONBIO",	0x5421},
+	{"asm/ioctls.h",	"TIOCNOTTY",	0x5422},
+	{"asm/ioctls.h",	"TIOCSETD",	0x5423},
+	{"asm/ioctls.h",	"TIOCGETD",	0x5424},
+	{"asm/ioctls.h",	"TCSBRKP",	0x5425},
+	{"asm/ioctls.h",	"TIOCTTYGSTRUCT",	0x5426},
+	{"asm/ioctls.h",	"TIOCSBRK",	0x5427},
+	{"asm/ioctls.h",	"TIOCCBRK",	0x5428},
+	{"asm/ioctls.h",	"TIOCGSID",	0x5429},
+	{"asm/ioctls.h",	"TIOCGPTN",	0x5430},
+	{"asm/ioctls.h",	"TIOCSPTLCK",	0x5431},
+	{"asm/ioctls.h",	"FIONCLEX",	0x5450},
+	{"asm/ioctls.h",	"FIOCLEX",	0x5451},
+	{"asm/ioctls.h",	"FIOASYNC",	0x5452},
+	{"asm/ioctls.h",	"TIOCSERCONFIG",	0x5453},
+	{"asm/ioctls.h",	"TIOCSERGWILD",	0x5454},
+	{"asm/ioctls.h",	"TIOCSERSWILD",	0x5455},
+	{"asm/ioctls.h",	"TIOCGLCKTRMIOS",	0x5456},
+	{"asm/ioctls.h",	"TIOCSLCKTRMIOS",	0x5457},
+	{"asm/ioctls.h",	"TIOCSERGSTRUCT",	0x5458},
+	{"asm/ioctls.h",	"TIOCSERGETLSR",	0x5459},
+	{"asm/ioctls.h",	"TIOCSERGETMULTI",	0x545a},
+	{"asm/ioctls.h",	"TIOCSERSETMULTI",	0x545b},
+	{"asm/ioctls.h",	"TIOCMIWAIT",	0x545c},
+	{"asm/ioctls.h",	"TIOCGICOUNT",	0x545d},
+	{"asm/ioctls.h",	"TIOCGHAYESESP",	0x545e},
+	{"asm/ioctls.h",	"TIOCSHAYESESP",	0x545f},
--- a/linux/mips/ioctlent.sh
+++ b/linux/mips/ioctlent.sh
@ -26,8 +26,6 @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-#	$Id$

 # Files to find.
 file_find='asm/*.h linux/*.h scsi/*.h'
--- a/linux/mips/syscallent.h
+++ b/linux/mips/syscallent.h
--- a/linux/mtd-abi.h
+++ b/linux/mtd-abi.h
@ -0,0 +1,278 @@
+/*
+ * Copyright © 1999-2010 David Woodhouse <dwmw2@infradead.org> et al.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __MTD_ABI_H__
+#define __MTD_ABI_H__
+
+#include <linux/types.h>
+
+struct erase_info_user {
+	__u32 start;
+	__u32 length;
+};
+
+struct erase_info_user64 {
+	__u64 start;
+	__u64 length;
+};
+
+struct mtd_oob_buf {
+	__u32 start;
+	__u32 length;
+	unsigned char *ptr;
+};
+
+struct mtd_oob_buf64 {
+	__u64 start;
+	__u32 pad;
+	__u32 length;
+	__u64 usr_ptr;
+};
+
+/**
+ * MTD operation modes
+ *
+ * @MTD_OPS_PLACE_OOB:	OOB data are placed at the given offset (default)
+ * @MTD_OPS_AUTO_OOB:	OOB data are automatically placed at the free areas
+ *			which are defined by the internal ecclayout
+ * @MTD_OPS_RAW:	data are transferred as-is, with no error correction;
+ *			this mode implies %MTD_OPS_PLACE_OOB
+ *
+ * These modes can be passed to ioctl(MEMWRITE) and are also used internally.
+ * See notes on "MTD file modes" for discussion on %MTD_OPS_RAW vs.
+ * %MTD_FILE_MODE_RAW.
+ */
+enum {
+	MTD_OPS_PLACE_OOB = 0,
+	MTD_OPS_AUTO_OOB = 1,
+	MTD_OPS_RAW = 2,
+};
+
+/**
+ * struct mtd_write_req - data structure for requesting a write operation
+ *
+ * @start:	start address
+ * @len:	length of data buffer
+ * @ooblen:	length of OOB buffer
+ * @usr_data:	user-provided data buffer
+ * @usr_oob:	user-provided OOB buffer
+ * @mode:	MTD mode (see "MTD operation modes")
+ * @padding:	reserved, must be set to 0
+ *
+ * This structure supports ioctl(MEMWRITE) operations, allowing data and/or OOB
+ * writes in various modes. To write to OOB-only, set @usr_data == NULL, and to
+ * write data-only, set @usr_oob == NULL. However, setting both @usr_data and
+ * @usr_oob to NULL is not allowed.
+ */
+struct mtd_write_req {
+	__u64 start;
+	__u64 len;
+	__u64 ooblen;
+	__u64 usr_data;
+	__u64 usr_oob;
+	__u8 mode;
+	__u8 padding[7];
+};
+
+#define MTD_ABSENT		0
+#define MTD_RAM			1
+#define MTD_ROM			2
+#define MTD_NORFLASH		3
+#define MTD_NANDFLASH		4
+#define MTD_DATAFLASH		6
+#define MTD_UBIVOLUME		7
+#define MTD_MLCNANDFLASH	8
+
+#define MTD_WRITEABLE		0x400	/* Device is writeable */
+#define MTD_BIT_WRITEABLE	0x800	/* Single bits can be flipped */
+#define MTD_NO_ERASE		0x1000	/* No erase necessary */
+#define MTD_POWERUP_LOCK	0x2000	/* Always locked after reset */
+
+/* Some common devices / combinations of capabilities */
+#define MTD_CAP_ROM		0
+#define MTD_CAP_RAM		(MTD_WRITEABLE | MTD_BIT_WRITEABLE | MTD_NO_ERASE)
+#define MTD_CAP_NORFLASH	(MTD_WRITEABLE | MTD_BIT_WRITEABLE)
+#define MTD_CAP_NANDFLASH	(MTD_WRITEABLE)
+
+/* Obsolete ECC byte placement modes (used with obsolete MEMGETOOBSEL) */
+#define MTD_NANDECC_OFF		0	// Switch off ECC (Not recommended)
+#define MTD_NANDECC_PLACE	1	// Use the given placement in the structure (YAFFS1 legacy mode)
+#define MTD_NANDECC_AUTOPLACE	2	// Use the default placement scheme
+#define MTD_NANDECC_PLACEONLY	3	// Use the given placement in the structure (Do not store ecc result on read)
+#define MTD_NANDECC_AUTOPL_USR 	4	// Use the given autoplacement scheme rather than using the default
+
+/* OTP mode selection */
+#define MTD_OTP_OFF		0
+#define MTD_OTP_FACTORY		1
+#define MTD_OTP_USER		2
+
+struct mtd_info_user {
+	__u8 type;
+	__u32 flags;
+	__u32 size;	/* Total size of the MTD */
+	__u32 erasesize;
+	__u32 writesize;
+	__u32 oobsize;	/* Amount of OOB data per block (e.g. 16) */
+	__u64 padding;	/* Old obsolete field; do not use */
+};
+
+struct region_info_user {
+	__u32 offset;		/* At which this region starts,
+				 * from the beginning of the MTD */
+	__u32 erasesize;	/* For this region */
+	__u32 numblocks;	/* Number of blocks in this region */
+	__u32 regionindex;
+};
+
+struct otp_info {
+	__u32 start;
+	__u32 length;
+	__u32 locked;
+};
+
+/*
+ * Note, the following ioctl existed in the past and was removed:
+ * #define MEMSETOOBSEL           _IOW('M', 9, struct nand_oobinfo)
+ * Try to avoid adding a new ioctl with the same ioctl number.
+ */
+
+/* Get basic MTD characteristics info (better to use sysfs) */
+#define MEMGETINFO		_IOR('M', 1, struct mtd_info_user)
+/* Erase segment of MTD */
+#define MEMERASE		_IOW('M', 2, struct erase_info_user)
+/* Write out-of-band data from MTD */
+#define MEMWRITEOOB		_IOWR('M', 3, struct mtd_oob_buf)
+/* Read out-of-band data from MTD */
+#define MEMREADOOB		_IOWR('M', 4, struct mtd_oob_buf)
+/* Lock a chip (for MTD that supports it) */
+#define MEMLOCK			_IOW('M', 5, struct erase_info_user)
+/* Unlock a chip (for MTD that supports it) */
+#define MEMUNLOCK		_IOW('M', 6, struct erase_info_user)
+/* Get the number of different erase regions */
+#define MEMGETREGIONCOUNT	_IOR('M', 7, int)
+/* Get information about the erase region for a specific index */
+#define MEMGETREGIONINFO	_IOWR('M', 8, struct region_info_user)
+/* Get info about OOB modes (e.g., RAW, PLACE, AUTO) - legacy interface */
+#define MEMGETOOBSEL		_IOR('M', 10, struct nand_oobinfo)
+/* Check if an eraseblock is bad */
+#define MEMGETBADBLOCK		_IOW('M', 11, __kernel_loff_t)
+/* Mark an eraseblock as bad */
+#define MEMSETBADBLOCK		_IOW('M', 12, __kernel_loff_t)
+/* Set OTP (One-Time Programmable) mode (factory vs. user) */
+#define OTPSELECT		_IOR('M', 13, int)
+/* Get number of OTP (One-Time Programmable) regions */
+#define OTPGETREGIONCOUNT	_IOW('M', 14, int)
+/* Get all OTP (One-Time Programmable) info about MTD */
+#define OTPGETREGIONINFO	_IOW('M', 15, struct otp_info)
+/* Lock a given range of user data (must be in mode %MTD_FILE_MODE_OTP_USER) */
+#define OTPLOCK			_IOR('M', 16, struct otp_info)
+/* Get ECC layout (deprecated) */
+#define ECCGETLAYOUT		_IOR('M', 17, struct nand_ecclayout_user)
+/* Get statistics about corrected/uncorrected errors */
+#define ECCGETSTATS		_IOR('M', 18, struct mtd_ecc_stats)
+/* Set MTD mode on a per-file-descriptor basis (see "MTD file modes") */
+#define MTDFILEMODE		_IO('M', 19)
+/* Erase segment of MTD (supports 64-bit address) */
+#define MEMERASE64		_IOW('M', 20, struct erase_info_user64)
+/* Write data to OOB (64-bit version) */
+#define MEMWRITEOOB64		_IOWR('M', 21, struct mtd_oob_buf64)
+/* Read data from OOB (64-bit version) */
+#define MEMREADOOB64		_IOWR('M', 22, struct mtd_oob_buf64)
+/* Check if chip is locked (for MTD that supports it) */
+#define MEMISLOCKED		_IOR('M', 23, struct erase_info_user)
+/*
+ * Most generic write interface; can write in-band and/or out-of-band in various
+ * modes (see "struct mtd_write_req"). This ioctl is not supported for flashes
+ * without OOB, e.g., NOR flash.
+ */
+#define MEMWRITE		_IOWR('M', 24, struct mtd_write_req)
+
+/*
+ * Obsolete legacy interface. Keep it in order not to break userspace
+ * interfaces
+ */
+struct nand_oobinfo {
+	__u32 useecc;
+	__u32 eccbytes;
+	__u32 oobfree[8][2];
+	__u32 eccpos[32];
+};
+
+struct nand_oobfree {
+	__u32 offset;
+	__u32 length;
+};
+
+#define MTD_MAX_OOBFREE_ENTRIES	8
+#define MTD_MAX_ECCPOS_ENTRIES	64
+/*
+ * OBSOLETE: ECC layout control structure. Exported to user-space via ioctl
+ * ECCGETLAYOUT for backwards compatbility and should not be mistaken as a
+ * complete set of ECC information. The ioctl truncates the larger internal
+ * structure to retain binary compatibility with the static declaration of the
+ * ioctl. Note that the "MTD_MAX_..._ENTRIES" macros represent the max size of
+ * the user struct, not the MAX size of the internal struct nand_ecclayout.
+ */
+struct nand_ecclayout_user {
+	__u32 eccbytes;
+	__u32 eccpos[MTD_MAX_ECCPOS_ENTRIES];
+	__u32 oobavail;
+	struct nand_oobfree oobfree[MTD_MAX_OOBFREE_ENTRIES];
+};
+
+/**
+ * struct mtd_ecc_stats - error correction stats
+ *
+ * @corrected:	number of corrected bits
+ * @failed:	number of uncorrectable errors
+ * @badblocks:	number of bad blocks in this partition
+ * @bbtblocks:	number of blocks reserved for bad block tables
+ */
+struct mtd_ecc_stats {
+	__u32 corrected;
+	__u32 failed;
+	__u32 badblocks;
+	__u32 bbtblocks;
+};
+
+/*
+ * MTD file modes - for read/write access to MTD
+ *
+ * @MTD_FILE_MODE_NORMAL:	OTP disabled, ECC enabled
+ * @MTD_FILE_MODE_OTP_FACTORY:	OTP enabled in factory mode
+ * @MTD_FILE_MODE_OTP_USER:	OTP enabled in user mode
+ * @MTD_FILE_MODE_RAW:		OTP disabled, ECC disabled
+ *
+ * These modes can be set via ioctl(MTDFILEMODE). The mode mode will be retained
+ * separately for each open file descriptor.
+ *
+ * Note: %MTD_FILE_MODE_RAW provides the same functionality as %MTD_OPS_RAW -
+ * raw access to the flash, without error correction or autoplacement schemes.
+ * Wherever possible, the MTD_OPS_* mode will override the MTD_FILE_MODE_* mode
+ * (e.g., when using ioctl(MEMWRITE)), but in some cases, the MTD_FILE_MODE is
+ * used out of necessity (e.g., `write()', ioctl(MEMWRITEOOB64)).
+ */
+enum mtd_file_modes {
+	MTD_FILE_MODE_NORMAL = MTD_OTP_OFF,
+	MTD_FILE_MODE_OTP_FACTORY = MTD_OTP_FACTORY,
+	MTD_FILE_MODE_OTP_USER = MTD_OTP_USER,
+	MTD_FILE_MODE_RAW,
+};
+
+#endif /* __MTD_ABI_H__ */
--- a/linux/powerpc/.cvsignore
+++ b/linux/powerpc/.cvsignore
@ -1 +0,0 @@
-Makefile
--- a/linux/powerpc/errnoent1.h
+++ b/linux/powerpc/errnoent1.h
@ -0,0 +1 @@
+#include "../errnoent.h"
--- a/linux/powerpc/ioctlent.h
+++ b/linux/powerpc/ioctlent.h
--- a/linux/powerpc/ioctlent.h.in
+++ b/linux/powerpc/ioctlent.h.in
@ -0,0 +1,114 @@
+	{"asm-generic/ioctls.h",	"TCGETS",	0x5401},
+	{"asm-generic/ioctls.h",	"TCSETS",	0x5402},
+	{"asm-generic/ioctls.h",	"TCSETSW",	0x5403},
+	{"asm-generic/ioctls.h",	"TCSETSF",	0x5404},
+	{"asm-generic/ioctls.h",	"TCGETA",	0x5405},
+	{"asm-generic/ioctls.h",	"TCSETA",	0x5406},
+	{"asm-generic/ioctls.h",	"TCSETAW",	0x5407},
+	{"asm-generic/ioctls.h",	"TCSETAF",	0x5408},
+	{"asm-generic/ioctls.h",	"TCSBRK",	0x5409},
+	{"asm-generic/ioctls.h",	"TCXONC",	0x540a},
+	{"asm-generic/ioctls.h",	"TCFLSH",	0x540b},
+	{"asm/ioctls.h",	"TIOCEXCL",	0x540c},
+	{"asm/ioctls.h",	"TIOCNXCL",	0x540d},
+	{"asm/ioctls.h",	"TIOCSCTTY",	0x540e},
+	{"asm-generic/ioctls.h",	"TIOCGPGRP",	0x540f},
+	{"asm-generic/ioctls.h",	"TIOCSPGRP",	0x5410},
+	{"asm-generic/ioctls.h",	"TIOCOUTQ",	0x5411},
+	{"asm/ioctls.h",	"TIOCSTI",	0x5412},
+	{"asm-generic/ioctls.h",	"TIOCGWINSZ",	0x5413},
+	{"asm-generic/ioctls.h",	"TIOCSWINSZ",	0x5414},
+	{"asm/ioctls.h",	"TIOCMGET",	0x5415},
+	{"asm/ioctls.h",	"TIOCMBIS",	0x5416},
+	{"asm/ioctls.h",	"TIOCMBIC",	0x5417},
+	{"asm/ioctls.h",	"TIOCMSET",	0x5418},
+	{"asm/ioctls.h",	"TIOCGSOFTCAR",	0x5419},
+	{"asm/ioctls.h",	"TIOCSSOFTCAR",	0x541a},
+	{"asm-generic/ioctls.h",	"FIONREAD",	0x541b},
+	{"asm/ioctls.h",	"TIOCLINUX",	0x541c},
+	{"asm/ioctls.h",	"TIOCCONS",	0x541d},
+	{"asm/ioctls.h",	"TIOCGSERIAL",	0x541e},
+	{"asm/ioctls.h",	"TIOCSSERIAL",	0x541f},
+	{"asm/ioctls.h",	"TIOCPKT",	0x5420},
+	{"asm-generic/ioctls.h",	"FIONBIO",	0x5421},
+	{"asm/ioctls.h",	"TIOCNOTTY",	0x5422},
+	{"asm/ioctls.h",	"TIOCSETD",	0x5423},
+	{"asm/ioctls.h",	"TIOCGETD",	0x5424},
+	{"asm/ioctls.h",	"TCSBRKP",	0x5425},
+	{"asm/ioctls.h",	"TIOCSBRK",	0x5427},
+	{"asm/ioctls.h",	"TIOCCBRK",	0x5428},
+	{"asm/ioctls.h",	"TIOCGSID",	0x5429},
+	{"asm-generic/ioctls.h",	"TCGETS2",	0x542a},
+	{"asm-generic/ioctls.h",	"TCSETS2",	0x542b},
+	{"asm-generic/ioctls.h",	"TCSETSW2",	0x542c},
+	{"asm-generic/ioctls.h",	"TCSETSF2",	0x542d},
+	{"asm/ioctls.h",	"TIOCGRS485",	0x542e},
+	{"asm/ioctls.h",	"TIOCSRS485",	0x542f},
+	{"asm/ioctls.h",	"TIOCGPTN",	0x5430},
+	{"asm/ioctls.h",	"TIOCSPTLCK",	0x5431},
+	{"asm-generic/ioctls.h",	"TCGETX",	0x5432},
+	{"asm-generic/ioctls.h",	"TCSETX",	0x5433},
+	{"asm-generic/ioctls.h",	"TCSETXF",	0x5434},
+	{"asm-generic/ioctls.h",	"TCSETXW",	0x5435},
+	{"asm/ioctls.h",	"TIOCSIG",	0x5436},
+	{"asm-generic/ioctls.h",	"FIONCLEX",	0x5450},
+	{"asm-generic/ioctls.h",	"FIOCLEX",	0x5451},
+	{"asm-generic/ioctls.h",	"FIOASYNC",	0x5452},
+	{"asm/ioctls.h",	"TIOCSERCONFIG",	0x5453},
+	{"asm/ioctls.h",	"TIOCSERGWILD",	0x5454},
+	{"asm/ioctls.h",	"TIOCSERSWILD",	0x5455},
+	{"asm/ioctls.h",	"TIOCGLCKTRMIOS",	0x5456},
+	{"asm/ioctls.h",	"TIOCSLCKTRMIOS",	0x5457},
+	{"asm/ioctls.h",	"TIOCSERGSTRUCT",	0x5458},
+	{"asm/ioctls.h",	"TIOCSERGETLSR",	0x5459},
+	{"asm/ioctls.h",	"TIOCSERGETMULTI",	0x545a},
+	{"asm/ioctls.h",	"TIOCSERSETMULTI",	0x545b},
+	{"asm/ioctls.h",	"TIOCMIWAIT",	0x545c},
+	{"asm/ioctls.h",	"TIOCGICOUNT",	0x545d},
+	{"asm-generic/ioctls.h",	"FIOQSIZE",	0x5460},
+	{"asm/ioctls.h",	"FIOCLEX",	0x6601},
+	{"asm/ioctls.h",	"FIONCLEX",	0x6602},
+	{"asm/ioctls.h",	"FIOASYNC",	0x667d},
+	{"asm/ioctls.h",	"FIONBIO",	0x667e},
+	{"asm/ioctls.h",	"FIONREAD",	0x667f},
+	{"asm/ioctls.h",	"FIOQSIZE",	0x6680},
+	{"asm/nvram.h",	"IOC_NVRAM_GET_OFFSET",	0x7042},
+	{"asm/nvram.h",	"IOC_NVRAM_SYNC",	0x7043},
+	{"asm/ps3fb.h",	"PS3FB_IOCTL_SETMODE",	0x7201},
+	{"asm/ps3fb.h",	"PS3FB_IOCTL_GETMODE",	0x7202},
+	{"asm/ps3fb.h",	"PS3FB_IOCTL_SCREENINFO",	0x7203},
+	{"asm/ps3fb.h",	"PS3FB_IOCTL_ON",	0x7204},
+	{"asm/ps3fb.h",	"PS3FB_IOCTL_OFF",	0x7205},
+	{"asm/ps3fb.h",	"PS3FB_IOCTL_FSEL",	0x7206},
+	{"asm/ioctls.h",	"TIOCGETP",	0x7408},
+	{"asm/ioctls.h",	"TIOCSETP",	0x7409},
+	{"asm/ioctls.h",	"TIOCSETN",	0x740a},
+	{"asm/ioctls.h",	"TIOCSETC",	0x7411},
+	{"asm/ioctls.h",	"TIOCGETC",	0x7412},
+	{"asm/ioctls.h",	"TCGETS",	0x7413},
+	{"asm/ioctls.h",	"TCSETS",	0x7414},
+	{"asm/ioctls.h",	"TCSETSW",	0x7415},
+	{"asm/ioctls.h",	"TCSETSF",	0x7416},
+	{"asm/ioctls.h",	"TCGETA",	0x7417},
+	{"asm/ioctls.h",	"TCSETA",	0x7418},
+	{"asm/ioctls.h",	"TCSETAW",	0x7419},
+	{"asm/ioctls.h",	"TCSETAF",	0x741c},
+	{"asm/ioctls.h",	"TCSBRK",	0x741d},
+	{"asm/ioctls.h",	"TCXONC",	0x741e},
+	{"asm/ioctls.h",	"TCFLSH",	0x741f},
+	{"asm/ioctls.h",	"TIOCSWINSZ",	0x7467},
+	{"asm/ioctls.h",	"TIOCGWINSZ",	0x7468},
+	{"asm/ioctls.h",	"TIOCSTART",	0x746e},
+	{"asm/ioctls.h",	"TIOCSTOP",	0x746f},
+	{"asm/ioctls.h",	"TIOCOUTQ",	0x7473},
+	{"asm/ioctls.h",	"TIOCGLTC",	0x7474},
+	{"asm/ioctls.h",	"TIOCSLTC",	0x7475},
+	{"asm/ioctls.h",	"TIOCSPGRP",	0x7476},
+	{"asm/ioctls.h",	"TIOCGPGRP",	0x7477},
+	{"asm/sockios.h",	"FIOSETOWN",	0x8901},
+	{"asm/sockios.h",	"SIOCSPGRP",	0x8902},
+	{"asm/sockios.h",	"FIOGETOWN",	0x8903},
+	{"asm/sockios.h",	"SIOCGPGRP",	0x8904},
+	{"asm/sockios.h",	"SIOCATMARK",	0x8905},
+	{"asm/sockios.h",	"SIOCGSTAMP",	0x8906},
+	{"asm/sockios.h",	"SIOCGSTAMPNS",	0x8907},
--- a/linux/powerpc/ioctlent1.h
+++ b/linux/powerpc/ioctlent1.h
@ -0,0 +1 @@
+#include "linux/ioctlent.h"
--- a/linux/powerpc/signalent1.h
+++ b/linux/powerpc/signalent1.h
@ -0,0 +1 @@
+#include "../signalent.h"
--- a/linux/powerpc/syscallent.h
+++ b/linux/powerpc/syscallent.h
@ -24,8 +24,6 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id$
 */

 	{ 0,	0,	sys_restart_syscall,	"restart_syscall"	}, /* 0 */
@ -52,7 +50,7 @@
 	{ 5,	TF,	sys_mount,		"mount"			}, /* 21 */
 	{ 1,	TF,	sys_umount,		"oldumount"		}, /* 22 */
 	{ 1,	0,	sys_setuid,		"setuid"		}, /* 23 */
-	{ 0,	0,	sys_getuid,		"getuid"		}, /* 24 */
+	{ 0,	NF,	sys_getuid,		"getuid"		}, /* 24 */
 	{ 1,	0,	sys_stime,		"stime"			}, /* 25 */
 	{ 4,	0,	sys_ptrace,		"ptrace"		}, /* 26 */
 	{ 1,	0,	sys_alarm,		"alarm"			}, /* 27 */
@ -75,16 +73,16 @@
 	{ 0,	0,	sys_prof,		"prof"			}, /* 44 */
 	{ 1,	0,	sys_brk,		"brk"			}, /* 45 */
 	{ 1,	0,	sys_setgid,		"setgid"		}, /* 46 */
-	{ 0,	0,	sys_getgid,		"getgid"		}, /* 47 */
+	{ 0,	NF,	sys_getgid,		"getgid"		}, /* 47 */
 	{ 3,	TS,	sys_signal,		"signal"		}, /* 48 */
-	{ 0,	0,	sys_geteuid,		"geteuid"		}, /* 49 */
-	{ 0,	0,	sys_getegid,		"getegid"		}, /* 50 */
+	{ 0,	NF,	sys_geteuid,		"geteuid"		}, /* 49 */
+	{ 0,	NF,	sys_getegid,		"getegid"		}, /* 50 */
 	{ 1,	TF,	sys_acct,		"acct"			}, /* 51 */
 	{ 2,	TF,	sys_umount2,		"umount"		}, /* 52 */
 	{ 0,	0,	sys_lock,		"lock"			}, /* 53 */
 	{ 3,	TD,	sys_ioctl,		"ioctl"			}, /* 54 */
 	{ 3,	TD,	sys_fcntl,		"fcntl"			}, /* 55 */
-	{ 0,	0,	sys_mpx,		"sys_mpx"		}, /* 56 */
+	{ 0,	0,	sys_mpx,		"mpx"			}, /* 56 */
 	{ 2,	0,	sys_setpgid,		"setpgid"		}, /* 57 */
 	{ 2,	0,	sys_ulimit,		"ulimit"		}, /* 58 */
 	{ 1,	0,	sys_oldolduname,	"oldolduname"		}, /* 59 */
@ -96,8 +94,8 @@
 	{ 0,	0,	sys_getpgrp,		"getpgrp"		}, /* 65 */
 	{ 0,	0,	sys_setsid,		"setsid"		}, /* 66 */
 	{ 3,	TS,	sys_sigaction,		"sigaction"		}, /* 67 */
-	{ 1,	TS,	printargs,		"sgetmask"		}, /* 68 */
-	{ 1,	TS,	printargs,		"ssetmask"		}, /* 69 */
+	{ 0,	TS,	sys_siggetmask,		"sgetmask"		}, /* 68 */
+	{ 1,	TS,	sys_sigsetmask,		"ssetmask"		}, /* 69 */
 	{ 2,	0,	sys_setreuid,		"setreuid"		}, /* 70 */
 	{ 2,	0,	sys_setregid,		"setregid"		}, /* 71 */
 	{ 3,	TS,	sys_sigsuspend,		"sigsuspend"		}, /* 72 */
@ -115,10 +113,10 @@
 	{ 2,	TF,	sys_oldlstat,		"oldlstat"		}, /* 84 */
 	{ 3,	TF,	sys_readlink,		"readlink"		}, /* 85 */
 	{ 1,	TF,	sys_uselib,		"uselib"		}, /* 86 */
-	{ 1,	TF,	sys_swapon,		"swapon"		}, /* 87 */
-	{ 3,	0,	sys_reboot,		"reboot"		}, /* 88 */
+	{ 2,	TF,	sys_swapon,		"swapon"		}, /* 87 */
+	{ 4,	0,	sys_reboot,		"reboot"		}, /* 88 */
 	{ 3,	TD,	sys_readdir,		"readdir"		}, /* 89 */
-	{ 6,	0,	sys_mmap,		"mmap"			}, /* 90 */
+	{ 6,	TD,	sys_mmap,		"mmap"			}, /* 90 */
 	{ 2,	0,	sys_munmap,		"munmap"		}, /* 91 */
 	{ 2,	TF,	sys_truncate,		"truncate"		}, /* 92 */
 	{ 2,	TD,	sys_ftruncate,		"ftruncate"		}, /* 93 */
@ -138,20 +136,20 @@
 	{ 2,	TF,	sys_lstat,		"lstat"			}, /* 107 */
 	{ 2,	TD,	sys_fstat,		"fstat"			}, /* 108 */
 	{ 1,	0,	sys_olduname,		"olduname"		}, /* 109 */
-	{ 5,	0,	printargs,		"SYS_110"		}, /* 110 */
+	{ 5,	0,	printargs,		"iopl"			}, /* 110 */
 	{ 0,	0,	sys_vhangup,		"vhangup"		}, /* 111 */
 	{ 0,	0,	sys_idle,		"idle"			}, /* 112 */
-	{ 5,	0,	printargs,		"SYS_113"		}, /* 113 */
+	{ 5,	0,	sys_vm86,		"vm86"			}, /* 113 */
 	{ 4,	TP,	sys_wait4,		"wait4"			}, /* 114 */
-	{ 1,	0,	sys_swapoff,		"swapoff"		}, /* 115 */
+	{ 1,	TF,	sys_swapoff,		"swapoff"		}, /* 115 */
 	{ 1,	0,	sys_sysinfo,		"sysinfo"		}, /* 116 */
-	{ 6,	0,	sys_ipc,		"ipc"			}, /* 117 */
+	{ 6,	TI,	sys_ipc,		"ipc"			}, /* 117 */
 	{ 1,	TD,	sys_fsync,		"fsync"			}, /* 118 */
-	{ 1,	TS,	sys_sigreturn,		"sigreturn"		}, /* 119 */
+	{ 0,	TS,	sys_sigreturn,		"sigreturn"		}, /* 119 */
 	{ 5,	TP,	sys_clone,		"clone"			}, /* 120 */
 	{ 2,	0,	sys_setdomainname,	"setdomainname"		}, /* 121 */
 	{ 1,	0,	sys_uname,		"uname"			}, /* 122 */
-	{ 5,	0,	printargs,		"SYS_123"		}, /* 123 */
+	{ 5,	0,	printargs,		"modify_ldt"		}, /* 123 */
 	{ 1,	0,	sys_adjtimex,		"adjtimex"		}, /* 124 */
 	{ 3,	0,	sys_mprotect,		"mprotect"		}, /* 125 */
 	{ 3,	TS,	sys_sigprocmask,	"sigprocmask"		}, /* 126 */
@ -166,8 +164,8 @@
 	{ 3,	0,	sys_sysfs,		"sysfs"			}, /* 135 */
 	{ 1,	0,	sys_personality,	"personality"		}, /* 136 */
 	{ 5,	0,	sys_afs_syscall,	"afs_syscall"		}, /* 137 */
-	{ 1,	0,	sys_setfsuid,		"setfsuid"		}, /* 138 */
-	{ 1,	0,	sys_setfsgid,		"setfsgid"		}, /* 139 */
+	{ 1,	NF,	sys_setfsuid,		"setfsuid"		}, /* 138 */
+	{ 1,	NF,	sys_setfsgid,		"setfsgid"		}, /* 139 */
 	{ 5,	TF,	sys_llseek,		"_llseek"		}, /* 140 */
 	{ 3,	TD,	sys_getdents,		"getdents"		}, /* 141 */
 	{ 5,	TD,	sys_select,		"select"		}, /* 142 */
@ -191,16 +189,16 @@
 	{ 1,	0,	sys_sched_get_priority_min,"sched_get_priority_min"}, /* 160 */
 	{ 2,	0,	sys_sched_rr_get_interval,"sched_rr_get_interval"}, /* 161 */
 	{ 2,	0,	sys_nanosleep,		"nanosleep"		}, /* 162 */
-	{ 4,	0,	sys_mremap,		"mremap"		}, /* 163 */
+	{ 5,	0,	sys_mremap,		"mremap"		}, /* 163 */
 	{ 3,	0,	sys_setresuid,		"setresuid"		}, /* 164 */
 	{ 3,	0,	sys_getresuid,		"getresuid"		}, /* 165 */
 	{ 5,	0,	sys_query_module,	"query_module"		}, /* 166 */
 	{ 3,	TD,	sys_poll,		"poll"			}, /* 167 */
-	{ 3,	0,	printargs,		"nfsservctl"		}, /* 168 */
+	{ 3,	0,	sys_nfsservctl,		"nfsservctl"		}, /* 168 */
 	{ 3,	0,	sys_setresgid,		"setresgid"		}, /* 169 */
 	{ 3,	0,	sys_getresgid,		"getresgid"		}, /* 170 */
 	{ 5,	0,	sys_prctl,		"prctl"			}, /* 171 */
-	{ 1,	TS,	printargs,		"rt_sigreturn"		}, /* 172 */
+	{ 0,	TS,	sys_rt_sigreturn,	"rt_sigreturn"		}, /* 172 */
 	{ 4,	TS,	sys_rt_sigaction,	"rt_sigaction"		}, /* 173 */
 	{ 4,	TS,	sys_rt_sigprocmask,	"rt_sigprocmask"	}, /* 174 */
 	{ 2,	TS,	sys_rt_sigpending,	"rt_sigpending"		}, /* 175 */
@ -219,53 +217,52 @@
 	{ 5,	0,	sys_putpmsg,		"putpmsg"		}, /* 188 */
 	{ 0,	TP,	sys_vfork,		"vfork"			}, /* 189 */
 	{ 2,	0,	sys_getrlimit,		"getrlimit"		}, /* 190 */
-	{ 4,	TD,	sys_readahead,		"readahead"		}, /* 190 */
-	{ 6,	0,	sys_mmap,		"mmap2"			}, /* 192 */
+	{ 5,	TD,	sys_readahead,		"readahead"		}, /* 190 */
+	{ 6,	TD,	sys_mmap,		"mmap2"			}, /* 192 */
 	{ 4,	TF,	sys_truncate64,		"truncate64"		}, /* 193 */
 	{ 4,	TD,	sys_ftruncate64,	"ftruncate64"		}, /* 194 */
-
 	{ 2,	TF,	sys_stat64,		"stat64"		}, /* 195 */
 	{ 2,	TF,	sys_lstat64,		"lstat64"		}, /* 196 */
 	{ 2,	TD,	sys_fstat64,		"fstat64"		}, /* 197 */
 	{ 5,	0,	printargs,		"pciconfig_read"	}, /* 198 */
 	{ 5,	0,	printargs,		"pciconfig_write"	}, /* 199 */
 	{ 3,	0,	printargs,		"pciconfig_iobase"	}, /* 200 */
-	{ 8,	0,	printargs,		"MOL"			}, /* 201 */
+	{ 6,	0,	printargs,		"MOL"			}, /* 201 */
 	{ 3,	TD,	sys_getdents64,		"getdents64"		}, /* 202 */
 	{ 2,	TF,	sys_pivotroot,		"pivot_root"		}, /* 203 */
 	{ 3,	TD,	sys_fcntl,		"fcntl64"		}, /* 204 */
 	{ 3,	0,	sys_madvise,		"madvise"		}, /* 205 */
 	{ 3,	0,	sys_mincore,		"mincore"		}, /* 206 */
-	{ 0,	0,	printargs,		"gettid"		}, /* 207 */
+	{ 0,	0,	sys_gettid,		"gettid"		}, /* 207 */
 	{ 2,	TS,	sys_kill,		"tkill"			}, /* 208 */
 	{ 5,	TF,	sys_setxattr,		"setxattr"		}, /* 209 */
 	{ 5,	TF,	sys_setxattr,		"lsetxattr"		}, /* 210 */
 	{ 5,	TD,	sys_fsetxattr,		"fsetxattr"		}, /* 211 */
 	{ 4,	TF,	sys_getxattr,		"getxattr"		}, /* 212 */
 	{ 4,	TF,	sys_getxattr,		"lgetxattr"		}, /* 213 */
-	{ 4,	0,	sys_fgetxattr,		"fgetxattr"		}, /* 214 */
+	{ 4,	TD,	sys_fgetxattr,		"fgetxattr"		}, /* 214 */
 	{ 3,	TF,	sys_listxattr,		"listxattr"		}, /* 215 */
 	{ 3,	TF,	sys_listxattr,		"llistxattr"		}, /* 216 */
-	{ 3,	0,	sys_flistxattr,		"flistxattr"		}, /* 217 */
+	{ 3,	TD,	sys_flistxattr,		"flistxattr"		}, /* 217 */
 	{ 2,	TF,	sys_removexattr,	"removexattr"		}, /* 218 */
 	{ 2,	TF,	sys_removexattr,	"lremovexattr"		}, /* 219 */
 	{ 2,	TD,	sys_fremovexattr,	"fremovexattr"		}, /* 220 */
 	{ 6,	0,	sys_futex,		"futex"			}, /* 221 */
 	{ 3,	0,	sys_sched_setaffinity,	"sched_setaffinity"	}, /* 222 */
 	{ 3,	0,	sys_sched_getaffinity,	"sched_getaffinity"	}, /* 223 */
-	{ 5,	0,	printargs,		"SYS_224"		}, /* 224 */
+	{ 5,	0,	NULL,			NULL			}, /* 224 */
 	{ 5,	0,	printargs,		"tux"			}, /* 225 */
 	{ 4,	TD|TN,	sys_sendfile64,		"sendfile64"		}, /* 226 */
 	{ 2,	0,	sys_io_setup,		"io_setup"		}, /* 227 */
 	{ 1,	0,	sys_io_destroy,		"io_destroy"		}, /* 228 */
-	{ 5,	0,	sys_io_getevents,		"io_getevents"		}, /* 229 */
+	{ 5,	0,	sys_io_getevents,	"io_getevents"		}, /* 229 */
 	{ 3,	0,	sys_io_submit,		"io_submit"		}, /* 230 */
 	{ 3,	0,	sys_io_cancel,		"io_cancel"		}, /* 231 */
-	{ 1,	0,	printargs,		"set_tid_address"	}, /* 232 */
-	{ 6,	0,	sys_fadvise64,		"fadvise64"		}, /* 233 */
+	{ 1,	0,	sys_set_tid_address,	"set_tid_address"	}, /* 232 */
+	{ 6,	TD,	sys_fadvise64,		"fadvise64"		}, /* 233 */
 	{ 1,	TP,	sys_exit,		"exit_group"		}, /* 234 */
-	{ 4,	0,	printargs,		"lookup_dcookie"	}, /* 235 */
-	{ 1,	0,	sys_epoll_create,	"epoll_create"		}, /* 236 */
+	{ 4,	0,	sys_lookup_dcookie,	"lookup_dcookie"	}, /* 235 */
+	{ 1,	TD,	sys_epoll_create,	"epoll_create"		}, /* 236 */
 	{ 4,	TD,	sys_epoll_ctl,		"epoll_ctl"		}, /* 237 */
 	{ 4,	TD,	sys_epoll_wait,		"epoll_wait"		}, /* 238 */
 	{ 5,	0,	sys_remap_file_pages,	"remap_file_pages"	}, /* 239 */
@ -283,11 +280,11 @@
 	{ 2,	TF,	sys_utimes,		"utimes"		}, /* 251 */
 	{ 3,	TF,	sys_statfs64,		"statfs64"		}, /* 252 */
 	{ 3,	TD,	sys_fstatfs64,		"fstatfs64"		}, /* 253 */
-	{ 6,	0,	sys_fadvise64_64,	"fadvise64_64"		}, /* 254 */
+	{ 6,	TD,	sys_fadvise64_64,	"fadvise64_64"		}, /* 254 */
 	{ 1,	0,	printargs,		"rtas"			}, /* 255 */
 	{ 5,	0,	printargs,		"debug_setcontext"	}, /* 256 */
-	{ 5,	0,	printargs,		"vserver"		}, /* 257 */
-	{ 5,	0,	printargs,		"SYS_258"		}, /* 258 */
+	{ 5,	0,	sys_vserver,		"vserver"		}, /* 257 */
+	{ 5,	0,	sys_migrate_pages,	"migrate_pages"		}, /* 258 */
 	{ 6,	0,	sys_mbind,		"mbind"			}, /* 259 */
 	{ 5,	0,	sys_get_mempolicy,	"get_mempolicy"		}, /* 260 */
 	{ 3,	0,	sys_set_mempolicy,	"set_mempolicy"		}, /* 261 */
@ -297,14 +294,14 @@
 	{ 5,	0,	sys_mq_timedreceive,	"mq_timedreceive"	}, /* 265 */
 	{ 2,	0,	sys_mq_notify,		"mq_notify"		}, /* 266 */
 	{ 3,	0,	sys_mq_getsetattr,	"mq_getsetattr"		}, /* 267 */
-	{ 5,	0,	printargs,		"sys_kexec_load"	}, /* 268 */
-	{ 5,	0,	printargs,		"add_key"		}, /* 269 */
-	{ 4,	0,	printargs,		"request_key"		}, /* 270 */
-	{ 5,	0,	printargs,		"keyctl"		}, /* 271 */
+	{ 4,	0,	sys_kexec_load,		"kexec_load"		}, /* 268 */
+	{ 5,	0,	sys_add_key,		"add_key"		}, /* 269 */
+	{ 4,	0,	sys_request_key,	"request_key"		}, /* 270 */
+	{ 5,	0,	sys_keyctl,		"keyctl"		}, /* 271 */
 	{ 5,	TP,	sys_waitid,		"waitid"		}, /* 272 */
-	{ 3,	0,	printargs,		"ioprio_set"		}, /* 273 */
-	{ 2,	0,	printargs,		"ioprio_get"		}, /* 274 */
-	{ 0,	TD,	printargs,		"inotify_init"		}, /* 275 */
+	{ 3,	0,	sys_ioprio_set,		"ioprio_set"		}, /* 273 */
+	{ 2,	0,	sys_ioprio_get,		"ioprio_get"		}, /* 274 */
+	{ 0,	TD,	sys_inotify_init,	"inotify_init"		}, /* 275 */
 	{ 3,	TD,	sys_inotify_add_watch,	"inotify_add_watch"	}, /* 276 */
 	{ 2,	TD,	sys_inotify_rm_watch,	"inotify_rm_watch"	}, /* 277 */
 	{ 5,	0,	printargs,		"spu_run"		}, /* 278 */
@ -312,15 +309,15 @@
 	{ 6,	TD,	sys_pselect6,		"pselect6"		}, /* 280 */
 	{ 5,	TD,	sys_ppoll,		"ppoll"			}, /* 281 */
 	{ 1,	TP,	sys_unshare,		"unshare"		}, /* 282 */
-	{ 6,	TD,	printargs,		"splice"		}, /* 283 */
-	{ 4,	TD,	printargs,		"tee"			}, /* 284 */
-	{ 4,	TD,	printargs,		"vmsplice"		}, /* 285 */
+	{ 6,	TD,	sys_splice,		"splice"		}, /* 283 */
+	{ 4,	TD,	sys_tee,		"tee"			}, /* 284 */
+	{ 4,	TD,	sys_vmsplice,		"vmsplice"		}, /* 285 */
 	{ 4,	TD|TF,	sys_openat,		"openat"		}, /* 286 */
 	{ 3,	TD|TF,	sys_mkdirat,		"mkdirat"		}, /* 287 */
 	{ 4,	TD|TF,	sys_mknodat,		"mknodat"		}, /* 288 */
 	{ 5,	TD|TF,	sys_fchownat,		"fchownat"		}, /* 289 */
 	{ 3,	TD|TF,	sys_futimesat,		"futimesat"		}, /* 290 */
-	{ 4,	TD|TD,	sys_newfstatat,		"newfstatat"		}, /* 291 */
+	{ 4,	TD|TF,	sys_newfstatat,		"newfstatat"		}, /* 291 */
 	{ 3,	TD|TF,	sys_unlinkat,		"unlinkat"		}, /* 292 */
 	{ 4,	TD|TF,	sys_renameat,		"renameat"		}, /* 293 */
 	{ 5,	TD|TF,	sys_linkat,		"linkat"		}, /* 294 */
@ -328,112 +325,112 @@
 	{ 4,	TD|TF,	sys_readlinkat,		"readlinkat"		}, /* 296 */
 	{ 3,	TD|TF,	sys_fchmodat,		"fchmodat"		}, /* 297 */
 	{ 3,	TD|TF,	sys_faccessat,		"faccessat"		}, /* 298 */
-	{ 2,	0,	printargs,		"set_robust_list"	}, /* 299 */
-	{ 3,	0,	printargs,		"get_robust_list"	}, /* 300 */
+	{ 3,	0,	sys_get_robust_list,	"get_robust_list"	}, /* 299 */
+	{ 2,	0,	sys_set_robust_list,	"set_robust_list"	}, /* 300 */
 	{ 6,	0,	sys_move_pages,		"move_pages"		}, /* 301 */
 	{ 3,	0,	sys_getcpu,		"getcpu"		}, /* 302 */
-	{ 5,	TD,	sys_epoll_pwait,	"epoll_pwait"		}, /* 303 */
-	{ 5,	0,	printargs,		"SYS_304"		}, /* 304 */
+	{ 6,	TD,	sys_epoll_pwait,	"epoll_pwait"		}, /* 303 */
+	{ 4,	TD|TF,	sys_utimensat,		"utimensat"		}, /* 304 */
 	{ 3,	TD|TS,	sys_signalfd,		"signalfd"		}, /* 305 */
-	{ 4,	TD,	sys_timerfd,		"timerfd"		}, /* 306 */
+	{ 4,	TD,	sys_timerfd_create,	"timerfd_create"	}, /* 306 */
 	{ 1,	TD,	sys_eventfd,		"eventfd"		}, /* 307 */
-	{ 5,	0,	printargs,		"SYS_308"		}, /* 308 */
-	{ 5,	0,	printargs,		"SYS_309"		}, /* 309 */
-	{ 3,    0,      sys_subpage_prot,       "subpage_prot"          }, /* 310 */
-	{ 5,	0,	printargs,		"SYS_311"		}, /* 311 */
-	{ 5,	0,	printargs,		"SYS_312"		}, /* 312 */
-	{ 5,	0,	printargs,		"SYS_313"		}, /* 313 */
-	{ 5,	0,	printargs,		"SYS_314"		}, /* 314 */
-	{ 5,	0,	printargs,		"SYS_315"		}, /* 315 */
-	{ 5,	0,	printargs,		"SYS_316"		}, /* 316 */
-	{ 5,	0,	printargs,		"SYS_317"		}, /* 317 */
-	{ 5,	0,	printargs,		"SYS_318"		}, /* 318 */
-	{ 5,	0,	printargs,		"SYS_319"		}, /* 319 */
-	{ 5,	0,	printargs,		"SYS_320"		}, /* 320 */
-	{ 5,	0,	printargs,		"SYS_321"		}, /* 321 */
-	{ 5,	0,	printargs,		"SYS_322"		}, /* 322 */
-	{ 5,	0,	printargs,		"SYS_323"		}, /* 323 */
-	{ 5,	0,	printargs,		"SYS_324"		}, /* 324 */
-	{ 5,	0,	printargs,		"SYS_325"		}, /* 325 */
-	{ 5,	0,	printargs,		"SYS_326"		}, /* 326 */
-	{ 5,	0,	printargs,		"SYS_327"		}, /* 327 */
-	{ 5,	0,	printargs,		"SYS_328"		}, /* 328 */
-	{ 5,	0,	printargs,		"SYS_329"		}, /* 329 */
-	{ 5,	0,	printargs,		"SYS_330"		}, /* 330 */
-	{ 5,	0,	printargs,		"SYS_331"		}, /* 331 */
-	{ 5,	0,	printargs,		"SYS_332"		}, /* 332 */
-	{ 5,	0,	printargs,		"SYS_333"		}, /* 333 */
-	{ 5,	0,	printargs,		"SYS_334"		}, /* 334 */
-	{ 5,	0,	printargs,		"SYS_335"		}, /* 335 */
-	{ 5,	0,	printargs,		"SYS_336"		}, /* 336 */
-	{ 5,	0,	printargs,		"SYS_337"		}, /* 337 */
-	{ 5,	0,	printargs,		"SYS_338"		}, /* 338 */
-	{ 5,	0,	printargs,		"SYS_339"		}, /* 339 */
-	{ 5,	0,	printargs,		"SYS_340"		}, /* 340 */
-	{ 5,	0,	printargs,		"SYS_341"		}, /* 341 */
-	{ 5,	0,	printargs,		"SYS_342"		}, /* 342 */
-	{ 5,	0,	printargs,		"SYS_343"		}, /* 343 */
-	{ 5,	0,	printargs,		"SYS_344"		}, /* 344 */
-	{ 5,	0,	printargs,		"SYS_345"		}, /* 345 */
-	{ 5,	0,	printargs,		"SYS_346"		}, /* 346 */
-	{ 5,	0,	printargs,		"SYS_347"		}, /* 347 */
-	{ 5,	0,	printargs,		"SYS_348"		}, /* 348 */
-	{ 5,	0,	printargs,		"SYS_349"		}, /* 349 */
-	{ 5,	0,	printargs,		"SYS_350"		}, /* 350 */
-	{ 5,	0,	printargs,		"SYS_351"		}, /* 351 */
-	{ 5,	0,	printargs,		"SYS_352"		}, /* 352 */
-	{ 5,	0,	printargs,		"SYS_353"		}, /* 353 */
-	{ 5,	0,	printargs,		"SYS_354"		}, /* 354 */
-	{ 5,	0,	printargs,		"SYS_355"		}, /* 355 */
-	{ 5,	0,	printargs,		"SYS_356"		}, /* 356 */
-	{ 5,	0,	printargs,		"SYS_357"		}, /* 357 */
-	{ 5,	0,	printargs,		"SYS_358"		}, /* 358 */
-	{ 5,	0,	printargs,		"SYS_359"		}, /* 359 */
-	{ 5,	0,	printargs,		"SYS_360"		}, /* 360 */
-	{ 5,	0,	printargs,		"SYS_361"		}, /* 361 */
-	{ 5,	0,	printargs,		"SYS_362"		}, /* 362 */
-	{ 5,	0,	printargs,		"SYS_363"		}, /* 363 */
-	{ 5,	0,	printargs,		"SYS_364"		}, /* 364 */
-	{ 5,	0,	printargs,		"SYS_365"		}, /* 365 */
-	{ 5,	0,	printargs,		"SYS_366"		}, /* 366 */
-	{ 5,	0,	printargs,		"SYS_367"		}, /* 367 */
-	{ 5,	0,	printargs,		"SYS_368"		}, /* 368 */
-	{ 5,	0,	printargs,		"SYS_369"		}, /* 369 */
-	{ 5,	0,	printargs,		"SYS_370"		}, /* 370 */
-	{ 5,	0,	printargs,		"SYS_371"		}, /* 371 */
-	{ 5,	0,	printargs,		"SYS_372"		}, /* 372 */
-	{ 5,	0,	printargs,		"SYS_373"		}, /* 373 */
-	{ 5,	0,	printargs,		"SYS_374"		}, /* 374 */
-	{ 5,	0,	printargs,		"SYS_375"		}, /* 375 */
-	{ 5,	0,	printargs,		"SYS_376"		}, /* 376 */
-	{ 5,	0,	printargs,		"SYS_377"		}, /* 377 */
-	{ 5,	0,	printargs,		"SYS_378"		}, /* 378 */
-	{ 5,	0,	printargs,		"SYS_379"		}, /* 379 */
-	{ 5,	0,	printargs,		"SYS_380"		}, /* 380 */
-	{ 5,	0,	printargs,		"SYS_381"		}, /* 381 */
-	{ 5,	0,	printargs,		"SYS_382"		}, /* 382 */
-	{ 5,	0,	printargs,		"SYS_383"		}, /* 383 */
-	{ 5,	0,	printargs,		"SYS_384"		}, /* 384 */
-	{ 5,	0,	printargs,		"SYS_385"		}, /* 385 */
-	{ 5,	0,	printargs,		"SYS_386"		}, /* 386 */
-	{ 5,	0,	printargs,		"SYS_387"		}, /* 387 */
-	{ 5,	0,	printargs,		"SYS_388"		}, /* 388 */
-	{ 5,	0,	printargs,		"SYS_389"		}, /* 389 */
-	{ 5,	0,	printargs,		"SYS_390"		}, /* 390 */
-	{ 5,	0,	printargs,		"SYS_391"		}, /* 391 */
-	{ 5,	0,	printargs,		"SYS_392"		}, /* 392 */
-	{ 5,	0,	printargs,		"SYS_393"		}, /* 393 */
-	{ 5,	0,	printargs,		"SYS_394"		}, /* 394 */
-	{ 5,	0,	printargs,		"SYS_395"		}, /* 395 */
-	{ 5,	0,	printargs,		"SYS_396"		}, /* 396 */
-	{ 5,	0,	printargs,		"SYS_397"		}, /* 397 */
-	{ 5,	0,	printargs,		"SYS_398"		}, /* 398 */
-	{ 5,	0,	printargs,		"SYS_399"		}, /* 399 */
+	{ 4,	TD,	sys_sync_file_range,	"sync_file_range"	}, /* 308 */
+	{ 6,	TD,	sys_fallocate,		"fallocate"		}, /* 309 */
+	{ 3,	0,	sys_subpage_prot,	"subpage_prot"		}, /* 310 */
+	{ 4,	TD,	sys_timerfd_settime,	"timerfd_settime"	}, /* 311 */
+	{ 2,	TD,	sys_timerfd_gettime,	"timerfd_gettime"	}, /* 312 */
+	{ 4,	TD|TS,	sys_signalfd4,		"signalfd4"		}, /* 313 */
+	{ 2,	TD,	sys_eventfd2,		"eventfd2"		}, /* 314 */
+	{ 1,	TD,	sys_epoll_create1,	"epoll_create1"		}, /* 315 */
+	{ 3,	TD,	sys_dup3,		"dup3"			}, /* 316 */
+	{ 2,	TD,	sys_pipe2,		"pipe2"			}, /* 317 */
+	{ 1,	TD,	sys_inotify_init1,	"inotify_init1"		}, /* 318 */
+	{ 5,	TD,	sys_perf_event_open,	"perf_event_open"	}, /* 319 */
+	{ 5,	TD,	sys_preadv,		"preadv"		}, /* 320 */
+	{ 5,	TD,	sys_pwritev,		"pwritev"		}, /* 321 */
+	{ 4,	TP|TS,	sys_rt_tgsigqueueinfo,	"rt_tgsigqueueinfo"	}, /* 322 */
+	{ 2,	TD,	sys_fanotify_init,	"fanotify_init"		}, /* 323 */
+	{ 5,	TD|TF,	sys_fanotify_mark,	"fanotify_mark"		}, /* 324 */
+	{ 4,	0,	sys_prlimit64,		"prlimit64"		}, /* 325 */
+	{ 3,	TN,	sys_socket,		"socket"		}, /* 326 */
+	{ 3,	TN,	sys_bind,		"bind"			}, /* 327 */
+	{ 3,	TN,	sys_connect,		"connect"		}, /* 328 */
+	{ 2,	TN,	sys_listen,		"listen"		}, /* 329 */
+	{ 3,	TN,	sys_accept,		"accept"		}, /* 330 */
+	{ 3,	TN,	sys_getsockname,	"getsockname"		}, /* 331 */
+	{ 3,	TN,	sys_getpeername,	"getpeername"		}, /* 332 */
+	{ 4,	TN,	sys_socketpair,		"socketpair"		}, /* 333 */
+	{ 4,	TN,	sys_send,		"send"			}, /* 334 */
+	{ 6,	TN,	sys_sendto,		"sendto"		}, /* 335 */
+	{ 4,	TN,	sys_recv,		"recv"			}, /* 336 */
+	{ 6,	TN,	sys_recvfrom,		"recvfrom"		}, /* 337 */
+	{ 2,	TN,	sys_shutdown,		"shutdown"		}, /* 338 */
+	{ 5,	TN,	sys_setsockopt,		"setsockopt"		}, /* 339 */
+	{ 5,	TN,	sys_getsockopt,		"getsockopt"		}, /* 340 */
+	{ 3,	TN,	sys_sendmsg,		"sendmsg"		}, /* 341 */
+	{ 5,	TN,	sys_recvmsg,		"recvmsg"		}, /* 342 */
+	{ 5,	TN,	sys_recvmmsg,		"recvmmsg"		}, /* 343 */
+	{ 4,	TN,	sys_accept4,		"accept4"		}, /* 344 */
+	{ 5,	TD|TF,	sys_name_to_handle_at,	"name_to_handle_at"	}, /* 345 */
+	{ 3,	TD,	sys_open_by_handle_at,	"open_by_handle_at"	}, /* 346 */
+	{ 2,	0,	sys_clock_adjtime,	"clock_adjtime"		}, /* 347 */
+	{ 1,	TD,	sys_syncfs,		"syncfs"		}, /* 348 */
+	{ 4,	TN,	sys_sendmmsg,		"sendmmsg"		}, /* 349 */
+	{ 2,	TD,	sys_setns,		"setns"			}, /* 350 */
+	{ 6,	0,	sys_process_vm_readv,	"process_vm_readv"	}, /* 351 */
+	{ 6,	0,	sys_process_vm_writev,	"process_vm_writev"	}, /* 352 */
+	{ 5,	0,	NULL,			NULL			}, /* 353 */
+	{ 5,	0,	NULL,			NULL			}, /* 354 */
+	{ 5,	0,	NULL,			NULL			}, /* 355 */
+	{ 5,	0,	NULL,			NULL			}, /* 356 */
+	{ 5,	0,	NULL,			NULL			}, /* 357 */
+	{ 5,	0,	NULL,			NULL			}, /* 358 */
+	{ 5,	0,	NULL,			NULL			}, /* 359 */
+	{ 5,	0,	NULL,			NULL			}, /* 360 */
+	{ 5,	0,	NULL,			NULL			}, /* 361 */
+	{ 5,	0,	NULL,			NULL			}, /* 362 */
+	{ 5,	0,	NULL,			NULL			}, /* 363 */
+	{ 5,	0,	NULL,			NULL			}, /* 364 */
+	{ 5,	0,	NULL,			NULL			}, /* 365 */
+	{ 5,	0,	NULL,			NULL			}, /* 366 */
+	{ 5,	0,	NULL,			NULL			}, /* 367 */
+	{ 5,	0,	NULL,			NULL			}, /* 368 */
+	{ 5,	0,	NULL,			NULL			}, /* 369 */
+	{ 5,	0,	NULL,			NULL			}, /* 370 */
+	{ 5,	0,	NULL,			NULL			}, /* 371 */
+	{ 5,	0,	NULL,			NULL			}, /* 372 */
+	{ 5,	0,	NULL,			NULL			}, /* 373 */
+	{ 5,	0,	NULL,			NULL			}, /* 374 */
+	{ 5,	0,	NULL,			NULL			}, /* 375 */
+	{ 5,	0,	NULL,			NULL			}, /* 376 */
+	{ 5,	0,	NULL,			NULL			}, /* 377 */
+	{ 5,	0,	NULL,			NULL			}, /* 378 */
+	{ 5,	0,	NULL,			NULL			}, /* 379 */
+	{ 5,	0,	NULL,			NULL			}, /* 380 */
+	{ 5,	0,	NULL,			NULL			}, /* 381 */
+	{ 5,	0,	NULL,			NULL			}, /* 382 */
+	{ 5,	0,	NULL,			NULL			}, /* 383 */
+	{ 5,	0,	NULL,			NULL			}, /* 384 */
+	{ 5,	0,	NULL,			NULL			}, /* 385 */
+	{ 5,	0,	NULL,			NULL			}, /* 386 */
+	{ 5,	0,	NULL,			NULL			}, /* 387 */
+	{ 5,	0,	NULL,			NULL			}, /* 388 */
+	{ 5,	0,	NULL,			NULL			}, /* 389 */
+	{ 5,	0,	NULL,			NULL			}, /* 390 */
+	{ 5,	0,	NULL,			NULL			}, /* 391 */
+	{ 5,	0,	NULL,			NULL			}, /* 392 */
+	{ 5,	0,	NULL,			NULL			}, /* 393 */
+	{ 5,	0,	NULL,			NULL			}, /* 394 */
+	{ 5,	0,	NULL,			NULL			}, /* 395 */
+	{ 5,	0,	NULL,			NULL			}, /* 396 */
+	{ 5,	0,	NULL,			NULL			}, /* 397 */
+	{ 5,	0,	NULL,			NULL			}, /* 398 */
+	{ 5,	0,	NULL,			NULL			}, /* 399 */

 #if SYS_socket_subcall != 400
 #error fix me
 #endif
-	{ 8,	0,	printargs,		"socket_subcall"}, /* 400 */
+	{ 6,	0,	printargs,		"socket_subcall"}, /* 400 */
 	{ 3,	TN,	sys_socket,		"socket"	}, /* 401 */
 	{ 3,	TN,	sys_bind,		"bind"		}, /* 402 */
 	{ 3,	TN,	sys_connect,		"connect"	}, /* 403 */
@ -449,40 +446,41 @@
 	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 413 */
 	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 414 */
 	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 415 */
-	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 416 */
+	{ 3,	TN,	sys_sendmsg,		"sendmsg"	}, /* 416 */
 	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 417 */
 	{ 4,	TN,	sys_accept4,		"accept4"	}, /* 418 */
+	{ 5,	TN,	sys_recvmmsg,		"recvmmsg"	}, /* 419 */

-#if SYS_ipc_subcall != 419
+#if SYS_ipc_subcall != 420
 #error fix me
 #endif
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 419 */
-	{ 4,	TI,	printargs,		"semop"		}, /* 420 */
-	{ 4,	TI,	sys_semget,		"semget"	}, /* 421 */
-	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 422 */
-	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 423 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 424 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 420 */
+	{ 4,	TI,	sys_semop,		"semop"		}, /* 421 */
+	{ 4,	TI,	sys_semget,		"semget"	}, /* 422 */
+	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 423 */
+	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 424 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 425 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 426 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 427 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 428 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 429 */
-	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 430 */
-	{ 4,	TI,	sys_msgrcv,		"msgrcv"	}, /* 431 */
-	{ 4,	TI,	sys_msgget,		"msgget"	}, /* 432 */
-	{ 4,	TI,	sys_msgctl,		"msgctl"	}, /* 433 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 434 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 430 */
+	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 431 */
+	{ 4,	TI,	sys_msgrcv,		"msgrcv"	}, /* 432 */
+	{ 4,	TI,	sys_msgget,		"msgget"	}, /* 433 */
+	{ 4,	TI,	sys_msgctl,		"msgctl"	}, /* 434 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 435 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 436 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 437 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 438 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 439 */
-	{ 4,	TI,	sys_shmat,		"shmat"		}, /* 440 */
-	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 441 */
-	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 442 */
-	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 443 */
-	{ 5,	0,	printargs,		"SYS_343"	}, /* 444 */
-	{ 5,	0,	printargs,		"SYS_344"	}, /* 445 */
-	{ 5,	0,	printargs,		"SYS_345"	}, /* 446 */
-	{ 5,	0,	printargs,		"SYS_346"	}, /* 447 */
-	{ 5,	0,	printargs,		"SYS_347"	}, /* 448 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 440 */
+	{ 4,	TI,	sys_shmat,		"shmat"		}, /* 441 */
+	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 442 */
+	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 443 */
+	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 444 */
+	{ 5,	0,	NULL,			NULL		}, /* 445 */
+	{ 5,	0,	NULL,			NULL		}, /* 446 */
+	{ 5,	0,	NULL,			NULL		}, /* 447 */
+	{ 5,	0,	NULL,			NULL		}, /* 448 */
+	{ 5,	0,	NULL,			NULL		}, /* 449 */
--- a/linux/powerpc/syscallent1.h
+++ b/linux/powerpc/syscallent1.h
@ -0,0 +1 @@
+#include "syscallent.h"
--- a/linux/s390/ioctlent.h
+++ b/linux/s390/ioctlent.h
@ -1,941 +0,0 @@
-{"linux/fs.h", "FIBMAP", 0x1},
-{"linux/fs.h", "FIGETBSZ", 0x2},
-{"linux/fd.h", "FDCLRPRM", 0x241},
-{"linux/fd.h", "FDMSGON", 0x245},
-{"linux/fd.h", "FDMSGOFF", 0x246},
-{"linux/fd.h", "FDFMTBEG", 0x247},
-{"linux/fd.h", "FDFMTEND", 0x249},
-{"linux/fd.h", "FDSETEMSGTRESH", 0x24a},
-{"linux/fd.h", "FDFLUSH", 0x24b},
-{"linux/fd.h", "FDRESET", 0x254},
-{"linux/fd.h", "FDWERRORCLR", 0x256},
-{"linux/fd.h", "FDRAWCMD", 0x258},
-{"linux/fd.h", "FDTWADDLE", 0x259},
-{"linux/fd.h", "FDEJECT", 0x25a},
-{"linux/hdreg.h", "HDIO_GETGEO", 0x301},
-{"linux/hdreg.h", "HDIO_GET_UNMASKINTR", 0x302},
-{"linux/hdreg.h", "HDIO_GET_MULTCOUNT", 0x304},
-{"linux/hdreg.h", "HDIO_OBSOLETE_IDENTITY", 0x307},
-{"linux/hdreg.h", "HDIO_GET_KEEPSETTINGS", 0x308},
-{"linux/hdreg.h", "HDIO_GET_32BIT", 0x309},
-{"linux/hdreg.h", "HDIO_GET_NOWERR", 0x30a},
-{"linux/hdreg.h", "HDIO_GET_DMA", 0x30b},
-{"linux/hdreg.h", "HDIO_GET_NICE", 0x30c},
-{"linux/hdreg.h", "HDIO_GET_IDENTITY", 0x30d},
-{"linux/hdreg.h", "HDIO_DRIVE_RESET", 0x31c},
-{"linux/hdreg.h", "HDIO_TRISTATE_HWIF", 0x31d},
-{"linux/hdreg.h", "HDIO_DRIVE_TASK", 0x31e},
-{"linux/hdreg.h", "HDIO_DRIVE_CMD", 0x31f},
-{"linux/hdreg.h", "HDIO_SET_MULTCOUNT", 0x321},
-{"linux/hdreg.h", "HDIO_SET_UNMASKINTR", 0x322},
-{"linux/hdreg.h", "HDIO_SET_KEEPSETTINGS", 0x323},
-{"linux/hdreg.h", "HDIO_SET_32BIT", 0x324},
-{"linux/hdreg.h", "HDIO_SET_NOWERR", 0x325},
-{"linux/hdreg.h", "HDIO_SET_DMA", 0x326},
-{"linux/hdreg.h", "HDIO_SET_PIO_MODE", 0x327},
-{"linux/hdreg.h", "HDIO_SCAN_HWIF", 0x328},
-{"linux/hdreg.h", "HDIO_SET_NICE", 0x329},
-{"linux/hdreg.h", "HDIO_UNREGISTER_HWIF", 0x32a},
-{"linux/hdreg.h", "HDIO_GETGEO_BIG", 0x330},
-{"linux/hdreg.h", "HDIO_GETGEO_BIG_RAW", 0x331},
-{"linux/umsdos_fs.h", "UMSDOS_READDIR_DOS", 0x4d2},
-{"linux/umsdos_fs.h", "UMSDOS_UNLINK_DOS", 0x4d3},
-{"linux/umsdos_fs.h", "UMSDOS_RMDIR_DOS", 0x4d4},
-{"linux/umsdos_fs.h", "UMSDOS_STAT_DOS", 0x4d5},
-{"linux/umsdos_fs.h", "UMSDOS_CREAT_EMD", 0x4d6},
-{"linux/umsdos_fs.h", "UMSDOS_UNLINK_EMD", 0x4d7},
-{"linux/umsdos_fs.h", "UMSDOS_READDIR_EMD", 0x4d8},
-{"linux/umsdos_fs.h", "UMSDOS_GETVERSION", 0x4d9},
-{"linux/umsdos_fs.h", "UMSDOS_INIT_EMD", 0x4da},
-{"linux/umsdos_fs.h", "UMSDOS_DOS_SETUP", 0x4db},
-{"linux/umsdos_fs.h", "UMSDOS_RENAME_DOS", 0x4dc},
-{"linux/lp.h", "LPCHAR", 0x601},
-{"linux/lp.h", "LPTIME", 0x602},
-{"linux/lp.h", "LPABORT", 0x604},
-{"linux/lp.h", "LPSETIRQ", 0x605},
-{"linux/ac97_codec.h", "AC97_RECMUX_MONO_MIX", 0x606},
-{"linux/lp.h", "LPGETIRQ", 0x606},
-{"linux/lp.h", "LPWAIT", 0x608},
-{"linux/lp.h", "LPCAREFUL", 0x609},
-{"linux/lp.h", "LPABORTOPEN", 0x60a},
-{"linux/lp.h", "LPGETSTATUS", 0x60b},
-{"linux/lp.h", "LPRESET", 0x60c},
-{"linux/lp.h", "LPGETSTATS", 0x60d},
-{"linux/lp.h", "LPGETFLAGS", 0x60e},
-{"linux/lp.h", "LPSETTIMEOUT", 0x60f},
-{"linux/fs.h", "BLKROSET", 0x125d},
-{"linux/fs.h", "BLKROGET", 0x125e},
-{"linux/fs.h", "BLKRRPART", 0x125f},
-{"linux/fs.h", "BLKGETSIZE", 0x1260},
-{"linux/fs.h", "BLKFLSBUF", 0x1261},
-{"linux/fs.h", "BLKRASET", 0x1262},
-{"linux/fs.h", "BLKRAGET", 0x1263},
-{"linux/fs.h", "BLKFRASET", 0x1264},
-{"linux/fs.h", "BLKFRAGET", 0x1265},
-{"linux/fs.h", "BLKSECTSET", 0x1266},
-{"linux/fs.h", "BLKSECTGET", 0x1267},
-{"linux/fs.h", "BLKSSZGET", 0x1268},
-{"linux/fs.h", "BLKPG", 0x1269},
-{"scsi/sg.h", "SG_SET_TIMEOUT", 0x2201},
-{"scsi/sg.h", "SG_GET_TIMEOUT", 0x2202},
-{"scsi/sg.h", "SG_EMULATED_HOST", 0x2203},
-{"scsi/sg.h", "SG_SET_TRANSFORM", 0x2204},
-{"scsi/sg.h", "SG_GET_TRANSFORM", 0x2205},
-{"scsi/sg.h", "SG_GET_COMMAND_Q", 0x2270},
-{"scsi/sg.h", "SG_SET_COMMAND_Q", 0x2271},
-{"scsi/sg.h", "SG_GET_RESERVED_SIZE", 0x2272},
-{"scsi/sg.h", "SG_SET_RESERVED_SIZE", 0x2275},
-{"scsi/sg.h", "SG_GET_SCSI_ID", 0x2276},
-{"scsi/sg.h", "SG_SET_FORCE_LOW_DMA", 0x2279},
-{"scsi/sg.h", "SG_GET_LOW_DMA", 0x227a},
-{"scsi/sg.h", "SG_SET_FORCE_PACK_ID", 0x227b},
-{"scsi/sg.h", "SG_GET_PACK_ID", 0x227c},
-{"scsi/sg.h", "SG_GET_NUM_WAITING", 0x227d},
-{"scsi/sg.h", "SG_SET_DEBUG", 0x227e},
-{"scsi/sg.h", "SG_GET_SG_TABLESIZE", 0x227f},
-{"scsi/sg.h", "SG_GET_VERSION_NUM", 0x2282},
-{"scsi/sg.h", "SG_NEXT_CMD_LEN", 0x2283},
-{"scsi/sg.h", "SG_SCSI_RESET", 0x2284},
-{"scsi/sg.h", "SG_IO", 0x2285},
-{"scsi/sg.h", "SG_GET_REQUEST_TABLE", 0x2286},
-{"scsi/sg.h", "SG_SET_KEEP_ORPHAN", 0x2287},
-{"scsi/sg.h", "SG_GET_KEEP_ORPHAN", 0x2288},
-{"linux/agpgart.h", "AGPIOC_ACQUIRE", 0x4101},
-{"linux/agpgart.h", "AGPIOC_RELEASE", 0x4102},
-{"linux/pmu.h", "PMU_IOC_SLEEP", 0x4200},
-{"asm/dasd.h", "BIODASDDISABLE", 0x4400},
-{"asm/dasd.h", "BIODASDENABLE", 0x4401},
-{"asm/dasd.h", "BIODASDRSRV", 0x4402},
-{"asm/dasd.h", "BIODASDRLSE", 0x4403},
-{"asm/dasd.h", "BIODASDSLCK", 0x4404},
-{"asm/dasd.h", "BIODASDPRRST", 0x4405},
-{"asm/dasd.h", "BIODASDQUIESCE", 0x4406},
-{"asm/dasd.h", "BIODASDRESUME", 0x4407},
-{"asm/cmb.h", "BIODASDCMFENABLE", 0x4420},
-{"asm/cmb.h", "BIODASDCMFDISABLE", 0x4421},
-{"asm/cmb.h", "BIODASDRESETCMB", 0x4422},
-{"linux/fb.h", "FBIOGET_VSCREENINFO", 0x4600},
-{"linux/fb.h", "FBIOPUT_VSCREENINFO", 0x4601},
-{"linux/ps2esdi.h", "CMD_READ", 0x4601},
-{"linux/fb.h", "FBIOGET_FSCREENINFO", 0x4602},
-{"linux/ps2esdi.h", "CMD_WRITE", 0x4602},
-{"linux/fb.h", "FBIOGETCMAP", 0x4604},
-{"linux/fb.h", "FBIOPUTCMAP", 0x4605},
-{"linux/fb.h", "FBIOPAN_DISPLAY", 0x4606},
-{"linux/fb.h", "FBIOGET_FCURSORINFO", 0x4607},
-{"linux/fb.h", "FBIOGET_VCURSORINFO", 0x4608},
-{"linux/fb.h", "FBIOPUT_VCURSORINFO", 0x4609},
-{"linux/fb.h", "FBIOGET_CURSORSTATE", 0x460a},
-{"linux/fb.h", "FBIOPUT_CURSORSTATE", 0x460b},
-{"linux/fb.h", "FBIOGET_CON2FBMAP", 0x460f},
-{"linux/fb.h", "FBIOPUT_CON2FBMAP", 0x4610},
-{"linux/fb.h", "FBIOBLANK", 0x4611},
-{"linux/fb.h", "FBIO_ALLOC", 0x4613},
-{"linux/fb.h", "FBIO_FREE", 0x4614},
-{"linux/fb.h", "FBIOGET_GLYPH", 0x4615},
-{"linux/fb.h", "FBIOGET_HWCINFO", 0x4616},
-{"linux/isdn.h", "IIOCNETAIF", 0x4901},
-{"linux/isdn.h", "IIOCNETDIF", 0x4902},
-{"linux/isdn.h", "IIOCNETSCF", 0x4903},
-{"linux/isdn.h", "IIOCNETGCF", 0x4904},
-{"linux/isdn.h", "IIOCNETANM", 0x4905},
-{"linux/isdn.h", "IIOCNETDNM", 0x4906},
-{"linux/isdn.h", "IIOCNETGNM", 0x4907},
-{"linux/isdn.h", "IIOCGETSET", 0x4908},
-{"linux/isdn.h", "IIOCSETSET", 0x4909},
-{"linux/isdn.h", "IIOCSETVER", 0x490a},
-{"linux/isdn.h", "IIOCNETHUP", 0x490b},
-{"linux/isdn.h", "IIOCSETGST", 0x490c},
-{"linux/isdn.h", "IIOCSETBRJ", 0x490d},
-{"linux/isdn.h", "IIOCSIGPRF", 0x490e},
-{"linux/isdn.h", "IIOCGETPRF", 0x490f},
-{"linux/isdn.h", "IIOCSETPRF", 0x4910},
-{"linux/isdn.h", "IIOCGETMAP", 0x4911},
-{"linux/isdn.h", "IIOCSETMAP", 0x4912},
-{"linux/isdn.h", "IIOCNETASL", 0x4913},
-{"linux/isdn.h", "IIOCNETDIL", 0x4914},
-{"linux/isdn.h", "IIOCGETCPS", 0x4915},
-{"linux/isdn.h", "IIOCGETDVR", 0x4916},
-{"linux/isdn.h", "IIOCNETLCR", 0x4917},
-{"linux/isdn.h", "IIOCNETDWRSET", 0x4918},
-{"linux/isdn.h", "IIOCNETALN", 0x4920},
-{"linux/isdn.h", "IIOCNETDLN", 0x4921},
-{"linux/isdn.h", "IIOCNETGPN", 0x4922},
-{"linux/isdn.h", "IIOCDBGVAR", 0x497f},
-{"linux/isdn.h", "IIOCDRVCTL", 0x4980},
-{"linux/kd.h", "KIOCSOUND", 0x4b2f},
-{"linux/kd.h", "KDMKTONE", 0x4b30},
-{"linux/kd.h", "KDGETLED", 0x4b31},
-{"linux/kd.h", "KDSETLED", 0x4b32},
-{"linux/kd.h", "KDGKBTYPE", 0x4b33},
-{"linux/kd.h", "KDADDIO", 0x4b34},
-{"linux/kd.h", "KDDELIO", 0x4b35},
-{"linux/kd.h", "KDENABIO", 0x4b36},
-{"linux/kd.h", "KDDISABIO", 0x4b37},
-{"linux/kd.h", "KDSETMODE", 0x4b3a},
-{"linux/kd.h", "KDGETMODE", 0x4b3b},
-{"linux/kd.h", "KDMAPDISP", 0x4b3c},
-{"linux/kd.h", "KDUNMAPDISP", 0x4b3d},
-{"linux/kd.h", "GIO_SCRNMAP", 0x4b40},
-{"linux/kd.h", "PIO_SCRNMAP", 0x4b41},
-{"linux/kd.h", "KDGKBMODE", 0x4b44},
-{"linux/kd.h", "KDSKBMODE", 0x4b45},
-{"linux/kd.h", "KDGKBENT", 0x4b46},
-{"linux/kd.h", "KDSKBENT", 0x4b47},
-{"linux/kd.h", "KDGKBSENT", 0x4b48},
-{"linux/kd.h", "KDSKBSENT", 0x4b49},
-{"linux/kd.h", "KDGKBDIACR", 0x4b4a},
-{"linux/kd.h", "KDSKBDIACR", 0x4b4b},
-{"linux/kd.h", "KDGETKEYCODE", 0x4b4c},
-{"linux/kd.h", "KDSETKEYCODE", 0x4b4d},
-{"linux/kd.h", "KDSIGACCEPT", 0x4b4e},
-{"linux/kd.h", "KDGHWCLK", 0x4b50},
-{"linux/kd.h", "KDSHWCLK", 0x4b51},
-{"linux/kd.h", "KDKBDREP", 0x4b52},
-{"linux/kd.h", "GIO_FONT", 0x4b60},
-{"linux/kd.h", "PIO_FONT", 0x4b61},
-{"linux/kd.h", "KDGKBMETA", 0x4b62},
-{"linux/kd.h", "KDSKBMETA", 0x4b63},
-{"linux/kd.h", "KDGKBLED", 0x4b64},
-{"linux/kd.h", "KDSKBLED", 0x4b65},
-{"linux/kd.h", "GIO_UNIMAP", 0x4b66},
-{"linux/kd.h", "PIO_UNIMAP", 0x4b67},
-{"linux/kd.h", "PIO_UNIMAPCLR", 0x4b68},
-{"linux/kd.h", "GIO_UNISCRNMAP", 0x4b69},
-{"linux/kd.h", "PIO_UNISCRNMAP", 0x4b6a},
-{"linux/kd.h", "GIO_FONTX", 0x4b6b},
-{"linux/kd.h", "PIO_FONTX", 0x4b6c},
-{"linux/kd.h", "PIO_FONTRESET", 0x4b6d},
-{"linux/kd.h", "GIO_CMAP", 0x4b70},
-{"linux/kd.h", "PIO_CMAP", 0x4b71},
-{"linux/kd.h", "KDFONTOP", 0x4b72},
-{"linux/loop.h", "LOOP_SET_FD", 0x4c00},
-{"linux/loop.h", "LOOP_CLR_FD", 0x4c01},
-{"linux/loop.h", "LOOP_SET_STATUS", 0x4c02},
-{"linux/loop.h", "LOOP_GET_STATUS", 0x4c03},
-{"linux/random.h", "RNDZAPENTCNT", 0x5204},
-{"linux/random.h", "RNDCLEARPOOL", 0x5206},
-{"linux/cdrom.h", "CDROMPAUSE", 0x5301},
-{"linux/cdrom.h", "CDROMRESUME", 0x5302},
-{"linux/cdrom.h", "CDROMPLAYMSF", 0x5303},
-{"linux/cdrom.h", "CDROMPLAYTRKIND", 0x5304},
-{"linux/cdrom.h", "CDROMREADTOCHDR", 0x5305},
-{"linux/cdrom.h", "CDROMREADTOCENTRY", 0x5306},
-{"linux/cdrom.h", "CDROMSTOP", 0x5307},
-{"linux/cdrom.h", "CDROMSTART", 0x5308},
-{"linux/cdrom.h", "CDROMEJECT", 0x5309},
-{"linux/cdrom.h", "CDROMVOLCTRL", 0x530a},
-{"linux/cdrom.h", "CDROMSUBCHNL", 0x530b},
-{"linux/cdrom.h", "CDROMREADMODE2", 0x530c},
-{"linux/cdrom.h", "CDROMREADMODE1", 0x530d},
-{"linux/cdrom.h", "CDROMREADAUDIO", 0x530e},
-{"linux/cdrom.h", "CDROMEJECT_SW", 0x530f},
-{"linux/cdrom.h", "CDROMMULTISESSION", 0x5310},
-{"linux/cdrom.h", "CDROM_GET_MCN", 0x5311},
-{"linux/cdrom.h", "CDROMRESET", 0x5312},
-{"linux/cdrom.h", "CDROMVOLREAD", 0x5313},
-{"linux/cdrom.h", "CDROMREADRAW", 0x5314},
-{"linux/cdrom.h", "CDROMREADCOOKED", 0x5315},
-{"linux/cdrom.h", "CDROMSEEK", 0x5316},
-{"linux/cdrom.h", "CDROMPLAYBLK", 0x5317},
-{"linux/cdrom.h", "CDROMREADALL", 0x5318},
-{"linux/cdrom.h", "CDROMCLOSETRAY", 0x5319},
-{"linux/cdrom.h", "CDROMGETSPINDOWN", 0x531d},
-{"linux/cdrom.h", "CDROMSETSPINDOWN", 0x531e},
-{"linux/cdrom.h", "CDROM_SET_OPTIONS", 0x5320},
-{"linux/cdrom.h", "CDROM_CLEAR_OPTIONS", 0x5321},
-{"linux/cdrom.h", "CDROM_SELECT_SPEED", 0x5322},
-{"linux/cdrom.h", "CDROM_SELECT_DISC", 0x5323},
-{"linux/cdrom.h", "CDROM_MEDIA_CHANGED", 0x5325},
-{"linux/cdrom.h", "CDROM_DRIVE_STATUS", 0x5326},
-{"linux/cdrom.h", "CDROM_DISC_STATUS", 0x5327},
-{"linux/cdrom.h", "CDROM_CHANGER_NSLOTS", 0x5328},
-{"linux/cdrom.h", "CDROM_LOCKDOOR", 0x5329},
-{"linux/cdrom.h", "CDROM_DEBUG", 0x5330},
-{"linux/cdrom.h", "CDROM_GET_CAPABILITY", 0x5331},
-{"scsi/scsi_ioctl.h", "SCSI_IOCTL_DOORLOCK", 0x5380},
-{"scsi/scsi_ioctl.h", "SCSI_IOCTL_DOORUNLOCK", 0x5381},
-{"scsi/scsi.h", "SCSI_IOCTL_GET_IDLUN", 0x5382},
-{"scsi/scsi.h", "SCSI_IOCTL_TAGGED_ENABLE", 0x5383},
-{"scsi/scsi.h", "SCSI_IOCTL_TAGGED_DISABLE", 0x5384},
-{"scsi/scsi.h", "SCSI_IOCTL_PROBE_HOST", 0x5385},
-{"scsi/scsi.h", "SCSI_IOCTL_GET_BUS_NUMBER", 0x5386},
-{"linux/cdrom.h", "DVD_READ_STRUCT", 0x5390},
-{"linux/cdrom.h", "DVD_WRITE_STRUCT", 0x5391},
-{"linux/cdrom.h", "DVD_AUTH", 0x5392},
-{"linux/cdrom.h", "CDROM_SEND_PACKET", 0x5393},
-{"linux/cdrom.h", "CDROM_NEXT_WRITABLE", 0x5394},
-{"linux/cdrom.h", "CDROM_LAST_WRITTEN", 0x5395},
-{"asm/ioctls.h", "TCGETS", 0x5401},
-{"asm/ioctls.h", "TCSETS", 0x5402},
-{"asm/ioctls.h", "TCSETSW", 0x5403},
-{"asm/ioctls.h", "TCSETSF", 0x5404},
-{"asm/ioctls.h", "TCGETA", 0x5405},
-{"asm/ioctls.h", "TCSETA", 0x5406},
-{"asm/ioctls.h", "TCSETAW", 0x5407},
-{"asm/ioctls.h", "TCSETAF", 0x5408},
-{"asm/ioctls.h", "TCSBRK", 0x5409},
-{"asm/ioctls.h", "TCXONC", 0x540a},
-{"asm/ioctls.h", "TCFLSH", 0x540b},
-{"asm/ioctls.h", "TIOCEXCL", 0x540c},
-{"asm/ioctls.h", "TIOCNXCL", 0x540d},
-{"asm/ioctls.h", "TIOCSCTTY", 0x540e},
-{"asm/ioctls.h", "TIOCGPGRP", 0x540f},
-{"asm/ioctls.h", "TIOCSPGRP", 0x5410},
-{"asm/ioctls.h", "TIOCOUTQ", 0x5411},
-{"asm/ioctls.h", "TIOCSTI", 0x5412},
-{"asm/ioctls.h", "TIOCGWINSZ", 0x5413},
-{"asm/ioctls.h", "TIOCSWINSZ", 0x5414},
-{"asm/ioctls.h", "TIOCMGET", 0x5415},
-{"asm/ioctls.h", "TIOCMBIS", 0x5416},
-{"asm/ioctls.h", "TIOCMBIC", 0x5417},
-{"asm/ioctls.h", "TIOCMSET", 0x5418},
-{"asm/ioctls.h", "TIOCGSOFTCAR", 0x5419},
-{"asm/ioctls.h", "TIOCSSOFTCAR", 0x541a},
-{"asm/ioctls.h", "FIONREAD", 0x541b},
-{"asm/ioctls.h", "TIOCLINUX", 0x541c},
-{"asm/ioctls.h", "TIOCCONS", 0x541d},
-{"asm/ioctls.h", "TIOCGSERIAL", 0x541e},
-{"asm/ioctls.h", "TIOCSSERIAL", 0x541f},
-{"asm/ioctls.h", "TIOCPKT", 0x5420},
-{"asm/ioctls.h", "FIONBIO", 0x5421},
-{"asm/ioctls.h", "TIOCNOTTY", 0x5422},
-{"asm/ioctls.h", "TIOCSETD", 0x5423},
-{"asm/ioctls.h", "TIOCGETD", 0x5424},
-{"asm/ioctls.h", "TCSBRKP", 0x5425},
-{"asm/ioctls.h", "TIOCTTYGSTRUCT", 0x5426},
-{"asm/ioctls.h", "TIOCSBRK", 0x5427},
-{"asm/ioctls.h", "TIOCCBRK", 0x5428},
-{"asm/ioctls.h", "TIOCGSID", 0x5429},
-{"asm/ioctls.h", "FIONCLEX", 0x5450},
-{"asm/ioctls.h", "FIOCLEX", 0x5451},
-{"asm/ioctls.h", "FIOASYNC", 0x5452},
-{"asm/ioctls.h", "TIOCSERCONFIG", 0x5453},
-{"asm/ioctls.h", "TIOCSERGWILD", 0x5454},
-{"asm/ioctls.h", "TIOCSERSWILD", 0x5455},
-{"asm/ioctls.h", "TIOCGLCKTRMIOS", 0x5456},
-{"asm/ioctls.h", "TIOCSLCKTRMIOS", 0x5457},
-{"asm/ioctls.h", "TIOCSERGSTRUCT", 0x5458},
-{"asm/ioctls.h", "TIOCSERGETLSR", 0x5459},
-{"asm/ioctls.h", "TIOCSERGETMULTI", 0x545a},
-{"asm/ioctls.h", "TIOCSERSETMULTI", 0x545b},
-{"asm/ioctls.h", "TIOCMIWAIT", 0x545c},
-{"asm/ioctls.h", "TIOCGICOUNT", 0x545d},
-{"asm/ioctls.h", "FIOQSIZE", 0x545e},
-{"linux/usbdevice_fs.h", "USBDEVFS_DISCARDURB", 0x550b},
-{"linux/usbdevice_fs.h", "USBDEVFS_RESET", 0x5514},
-{"linux/vt.h", "VT_OPENQRY", 0x5600},
-{"linux/vt.h", "VT_GETMODE", 0x5601},
-{"linux/vt.h", "VT_SETMODE", 0x5602},
-{"linux/vt.h", "VT_GETSTATE", 0x5603},
-{"linux/vt.h", "VT_SENDSIG", 0x5604},
-{"linux/vt.h", "VT_RELDISP", 0x5605},
-{"linux/vt.h", "VT_ACTIVATE", 0x5606},
-{"linux/vt.h", "VT_WAITACTIVE", 0x5607},
-{"linux/vt.h", "VT_DISALLOCATE", 0x5608},
-{"linux/vt.h", "VT_RESIZE", 0x5609},
-{"linux/vt.h", "VT_RESIZEX", 0x560a},
-{"linux/vt.h", "VT_LOCKSWITCH", 0x560b},
-{"linux/vt.h", "VT_UNLOCKSWITCH", 0x560c},
-{"linux/sonet.h", "SONET_SETFRAMING", 0x6115},
-{"linux/atm_nicstar.h", "NS_ADJBUFLEV", 0x6163},
-{"linux/atm_tcp.h", "SIOCSIFATMTCP", 0x6180},
-{"linux/atm_tcp.h", "ATMTCP_CREATE", 0x618e},
-{"linux/atm_tcp.h", "ATMTCP_REMOVE", 0x618f},
-{"linux/atmlec.h", "ATMLEC_CTRL", 0x61d0},
-{"linux/atmlec.h", "ATMLEC_DATA", 0x61d1},
-{"linux/atmlec.h", "ATMLEC_MCAST", 0x61d2},
-{"linux/atmmpc.h", "ATMMPC_CTRL", 0x61d8},
-{"linux/atmmpc.h", "ATMMPC_DATA", 0x61d9},
-{"linux/atmclip.h", "SIOCMKCLIP", 0x61e0},
-{"linux/atmarp.h", "ATMARPD_CTRL", 0x61e1},
-{"linux/atmarp.h", "ATMARP_MKIP", 0x61e2},
-{"linux/atmarp.h", "ATMARP_SETENTRY", 0x61e3},
-{"linux/atmarp.h", "ATMARP_ENCAP", 0x61e5},
-{"linux/atmsvc.h", "ATMSIGD_CTRL", 0x61f0},
-{"linux/comstats.h", "COM_GETPORTSTATS", 0x631e},
-{"linux/comstats.h", "COM_CLRPORTSTATS", 0x631f},
-{"linux/comstats.h", "COM_GETBRDSTATS", 0x6320},
-{"linux/comstats.h", "COM_READPORT", 0x6328},
-{"linux/comstats.h", "COM_READBOARD", 0x6329},
-{"linux/comstats.h", "COM_READPANEL", 0x632a},
-{"linux/video_decoder.h", "DECODER_DUMP", 0x64c0},
-{"linux/synclink.h", "MGSL_IOCSTXIDLE", 0x6d02},
-{"linux/synclink.h", "MGSL_IOCGTXIDLE", 0x6d03},
-{"linux/synclink.h", "MGSL_IOCTXENABLE", 0x6d04},
-{"linux/synclink.h", "MGSL_IOCRXENABLE", 0x6d05},
-{"linux/synclink.h", "MGSL_IOCTXABORT", 0x6d06},
-{"linux/synclink.h", "MGSL_IOCGSTATS", 0x6d07},
-{"linux/synclink.h", "MGSL_IOCLOOPTXDONE", 0x6d09},
-{"linux/synclink.h", "MGSL_IOCCLRMODCOUNT", 0x6d0f},
-{"linux/ncp_fs.h", "NCP_IOC_CONN_LOGGED_IN", 0x6e03},
-{"linux/rtc.h", "RTC_AIE_ON", 0x7001},
-{"linux/rtc.h", "RTC_AIE_OFF", 0x7002},
-{"linux/rtc.h", "RTC_UIE_ON", 0x7003},
-{"linux/rtc.h", "RTC_UIE_OFF", 0x7004},
-{"linux/rtc.h", "RTC_PIE_ON", 0x7005},
-{"linux/rtc.h", "RTC_PIE_OFF", 0x7006},
-{"linux/rtc.h", "RTC_WIE_ON", 0x700f},
-{"linux/rtc.h", "RTC_WIE_OFF", 0x7010},
-{"linux/nvram.h", "NVRAM_INIT", 0x7040},
-{"linux/nvram.h", "NVRAM_SETCKS", 0x7041},
-{"linux/ppdev.h", "PPCLAIM", 0x708b},
-{"linux/ppdev.h", "PPRELEASE", 0x708c},
-{"linux/ppdev.h", "PPYIELD", 0x708d},
-{"linux/ppdev.h", "PPEXCL", 0x708f},
-{"linux/telephony.h", "PHONE_CAPABILITIES", 0x7180},
-{"linux/telephony.h", "PHONE_RING", 0x7183},
-{"linux/telephony.h", "PHONE_HOOKSTATE", 0x7184},
-{"linux/telephony.h", "PHONE_RING_START", 0x7187},
-{"linux/telephony.h", "PHONE_RING_STOP", 0x7188},
-{"linux/telephony.h", "PHONE_REC_START", 0x718a},
-{"linux/telephony.h", "PHONE_REC_STOP", 0x718b},
-{"linux/telephony.h", "PHONE_REC_LEVEL", 0x718f},
-{"linux/telephony.h", "PHONE_PLAY_START", 0x7191},
-{"linux/telephony.h", "PHONE_PLAY_STOP", 0x7192},
-{"linux/telephony.h", "PHONE_PLAY_LEVEL", 0x7195},
-{"linux/telephony.h", "PHONE_GET_TONE_ON_TIME", 0x719e},
-{"linux/telephony.h", "PHONE_GET_TONE_OFF_TIME", 0x719f},
-{"linux/telephony.h", "PHONE_GET_TONE_STATE", 0x71a0},
-{"linux/telephony.h", "PHONE_BUSY", 0x71a1},
-{"linux/telephony.h", "PHONE_RINGBACK", 0x71a2},
-{"linux/telephony.h", "PHONE_DIALTONE", 0x71a3},
-{"linux/telephony.h", "PHONE_CPT_STOP", 0x71a4},
-{"linux/telephony.h", "PHONE_PSTN_GET_STATE", 0x71a5},
-{"linux/telephony.h", "PHONE_PSTN_LINETEST", 0x71a8},
-{"linux/ixjuser.h", "IXJCTL_DSP_RESET", 0x71c0},
-{"linux/ixjuser.h", "IXJCTL_DSP_IDLE", 0x71c5},
-{"linux/ixjuser.h", "IXJCTL_TESTRAM", 0x71c6},
-{"linux/ixjuser.h", "IXJCTL_AEC_STOP", 0x71cc},
-{"linux/ixjuser.h", "IXJCTL_AEC_GET_LEVEL", 0x71cd},
-{"linux/ixjuser.h", "IXJCTL_PSTN_LINETEST", 0x71d3},
-{"linux/ixjuser.h", "IXJCTL_DRYBUFFER_CLEAR", 0x71e7},
-{"linux/cdk.h", "STL_BINTR", 0x7314},
-{"linux/cdk.h", "STL_BSTART", 0x7315},
-{"linux/cdk.h", "STL_BSTOP", 0x7316},
-{"linux/cdk.h", "STL_BRESET", 0x7317},
-{"linux/cdk.h", "STL_GETPFLAG", 0x7350},
-{"linux/cdk.h", "STL_SETPFLAG", 0x7351},
-{"linux/if_ppp.h", "PPPIOCDISCONN", 0x7439},
-{"linux/if_ppp.h", "PPPIOCXFERUNIT", 0x744e},
-{"linux/jffs.h", "JFFS_PRINT_HASH", 0x745a},
-{"linux/jffs.h", "JFFS_PRINT_TREE", 0x745b},
-{"linux/jffs.h", "JFFS_GET_STATUS", 0x745c},
-{"asm/sockios.h", "FIOSETOWN", 0x8901},
-{"asm/sockios.h", "SIOCSPGRP", 0x8902},
-{"asm/sockios.h", "FIOGETOWN", 0x8903},
-{"asm/sockios.h", "SIOCGPGRP", 0x8904},
-{"asm/sockios.h", "SIOCATMARK", 0x8905},
-{"asm/sockios.h", "SIOCGSTAMP", 0x8906},
-{"linux/sockios.h", "SIOCADDRT", 0x890b},
-{"linux/sockios.h", "SIOCDELRT", 0x890c},
-{"linux/sockios.h", "SIOCRTMSG", 0x890d},
-{"linux/sockios.h", "SIOCGIFNAME", 0x8910},
-{"linux/sockios.h", "SIOCSIFLINK", 0x8911},
-{"linux/sockios.h", "SIOCGIFCONF", 0x8912},
-{"linux/sockios.h", "SIOCGIFFLAGS", 0x8913},
-{"linux/sockios.h", "SIOCSIFFLAGS", 0x8914},
-{"linux/sockios.h", "SIOCGIFADDR", 0x8915},
-{"linux/sockios.h", "SIOCSIFADDR", 0x8916},
-{"linux/sockios.h", "SIOCGIFDSTADDR", 0x8917},
-{"linux/sockios.h", "SIOCSIFDSTADDR", 0x8918},
-{"linux/sockios.h", "SIOCGIFBRDADDR", 0x8919},
-{"linux/sockios.h", "SIOCSIFBRDADDR", 0x891a},
-{"linux/sockios.h", "SIOCGIFNETMASK", 0x891b},
-{"linux/sockios.h", "SIOCSIFNETMASK", 0x891c},
-{"linux/sockios.h", "SIOCGIFMETRIC", 0x891d},
-{"linux/sockios.h", "SIOCSIFMETRIC", 0x891e},
-{"linux/sockios.h", "SIOCGIFMEM", 0x891f},
-{"linux/sockios.h", "SIOCSIFMEM", 0x8920},
-{"linux/sockios.h", "SIOCGIFMTU", 0x8921},
-{"linux/sockios.h", "SIOCSIFMTU", 0x8922},
-{"linux/sockios.h", "SIOCSIFNAME", 0x8923},
-{"linux/sockios.h", "SIOCSIFHWADDR", 0x8924},
-{"linux/sockios.h", "SIOCGIFENCAP", 0x8925},
-{"linux/sockios.h", "SIOCSIFENCAP", 0x8926},
-{"linux/sockios.h", "SIOCGIFHWADDR", 0x8927},
-{"linux/sockios.h", "SIOCGIFSLAVE", 0x8929},
-{"linux/sockios.h", "SIOCSIFSLAVE", 0x8930},
-{"linux/sockios.h", "SIOCADDMULTI", 0x8931},
-{"linux/sockios.h", "SIOCDELMULTI", 0x8932},
-{"linux/sockios.h", "SIOCGIFINDEX", 0x8933},
-{"linux/sockios.h", "SIOCSIFPFLAGS", 0x8934},
-{"linux/sockios.h", "SIOCGIFPFLAGS", 0x8935},
-{"linux/sockios.h", "SIOCDIFADDR", 0x8936},
-{"linux/sockios.h", "SIOCSIFHWBROADCAST", 0x8937},
-{"linux/sockios.h", "SIOCGIFCOUNT", 0x8938},
-{"linux/sockios.h", "SIOCGIFBR", 0x8940},
-{"linux/sockios.h", "SIOCSIFBR", 0x8941},
-{"linux/sockios.h", "SIOCGIFTXQLEN", 0x8942},
-{"linux/sockios.h", "SIOCSIFTXQLEN", 0x8943},
-{"linux/sockios.h", "SIOCDARP", 0x8953},
-{"linux/sockios.h", "SIOCGARP", 0x8954},
-{"linux/sockios.h", "SIOCSARP", 0x8955},
-{"linux/sockios.h", "SIOCDRARP", 0x8960},
-{"linux/sockios.h", "SIOCGRARP", 0x8961},
-{"linux/sockios.h", "SIOCSRARP", 0x8962},
-{"linux/sockios.h", "SIOCGIFMAP", 0x8970},
-{"linux/sockios.h", "SIOCSIFMAP", 0x8971},
-{"linux/sockios.h", "SIOCADDDLCI", 0x8980},
-{"linux/sockios.h", "SIOCDELDLCI", 0x8981},
-{"linux/sockios.h", "SIOCPROTOPRIVATE", 0x89e0},
-{"linux/sockios.h", "SIOCDEVPRIVATE", 0x89f0},
-{"linux/auto_fs.h", "AUTOFS_IOC_READY", 0x9360},
-{"linux/auto_fs.h", "AUTOFS_IOC_FAIL", 0x9361},
-{"linux/auto_fs.h", "AUTOFS_IOC_CATATONIC", 0x9362},
-{"linux/nbd.h", "NBD_SET_SOCK", 0xab00},
-{"linux/nbd.h", "NBD_SET_BLKSIZE", 0xab01},
-{"linux/nbd.h", "NBD_SET_SIZE", 0xab02},
-{"linux/nbd.h", "NBD_DO_IT", 0xab03},
-{"linux/nbd.h", "NBD_CLEAR_SOCK", 0xab04},
-{"linux/nbd.h", "NBD_CLEAR_QUE", 0xab05},
-{"linux/nbd.h", "NBD_PRINT_DEBUG", 0xab06},
-{"linux/nbd.h", "NBD_SET_SIZE_BLOCKS", 0xab07},
-{"linux/nbd.h", "NBD_DISCONNECT", 0xab08},
-{"linux/raw.h", "RAW_SETBIND", 0xac00},
-{"linux/raw.h", "RAW_GETBIND", 0xac01},
-{"linux/if_pppox.h", "PPPOEIOCDFWD", 0xb101},
-{"linux/lvm.h", "LV_ACTIVATE", 0xfe22},
-{"linux/lvm.h", "LV_DEACTIVATE", 0xfe23},
-{"linux/lvm.h", "LVM_RESET", 0xfe99},
-{"linux/lvm.h", "LVM_LOCK_LVM", 0xff00},
-{"linux/cyclades.h", "CYGETMON", 0x435901},
-{"linux/cyclades.h", "CYGETTHRESH", 0x435902},
-{"linux/cyclades.h", "CYSETTHRESH", 0x435903},
-{"linux/cyclades.h", "CYGETDEFTHRESH", 0x435904},
-{"linux/cyclades.h", "CYSETDEFTHRESH", 0x435905},
-{"linux/cyclades.h", "CYGETTIMEOUT", 0x435906},
-{"linux/cyclades.h", "CYSETTIMEOUT", 0x435907},
-{"linux/cyclades.h", "CYGETDEFTIMEOUT", 0x435908},
-{"linux/cyclades.h", "CYSETDEFTIMEOUT", 0x435909},
-{"linux/cyclades.h", "CYSETRFLOW", 0x43590a},
-{"linux/cyclades.h", "CYGETRFLOW", 0x43590b},
-{"linux/cyclades.h", "CYSETRTSDTR_INV", 0x43590c},
-{"linux/cyclades.h", "CYGETRTSDTR_INV", 0x43590d},
-{"linux/cyclades.h", "CYZSETPOLLCYCLE", 0x43590e},
-{"linux/cyclades.h", "CYZGETPOLLCYCLE", 0x43590f},
-{"linux/cyclades.h", "CYGETCD1400VER", 0x435910},
-{"linux/cyclades.h", "CYGETCARDINFO", 0x435911},
-{"linux/cyclades.h", "CYSETWAIT", 0x435912},
-{"linux/cyclades.h", "CYGETWAIT", 0x435913},
-{"linux/soundcard.h", "SOUND_MIXER_READ_VOLUME", 0x20044d00},
-{"linux/soundcard.h", "SOUND_MIXER_READ_BASS", 0x20044d01},
-{"linux/soundcard.h", "SOUND_MIXER_READ_TREBLE", 0x20044d02},
-{"linux/soundcard.h", "SOUND_MIXER_READ_SYNTH", 0x20044d03},
-{"linux/soundcard.h", "SOUND_MIXER_READ_PCM", 0x20044d04},
-{"linux/soundcard.h", "SOUND_MIXER_READ_SPEAKER", 0x20044d05},
-{"linux/soundcard.h", "SOUND_MIXER_READ_LINE", 0x20044d06},
-{"linux/soundcard.h", "SOUND_MIXER_READ_MIC", 0x20044d07},
-{"linux/soundcard.h", "SOUND_MIXER_READ_CD", 0x20044d08},
-{"linux/soundcard.h", "SOUND_MIXER_READ_IMIX", 0x20044d09},
-{"linux/soundcard.h", "SOUND_MIXER_READ_ALTPCM", 0x20044d0a},
-{"linux/soundcard.h", "SOUND_MIXER_READ_RECLEV", 0x20044d0b},
-{"linux/soundcard.h", "SOUND_MIXER_READ_IGAIN", 0x20044d0c},
-{"linux/soundcard.h", "SOUND_MIXER_READ_OGAIN", 0x20044d0d},
-{"linux/soundcard.h", "SOUND_MIXER_READ_LINE1", 0x20044d0e},
-{"linux/soundcard.h", "SOUND_MIXER_READ_LINE2", 0x20044d0f},
-{"linux/soundcard.h", "SOUND_MIXER_READ_LINE3", 0x20044d10},
-{"linux/soundcard.h", "SOUND_MIXER_READ_MUTE", 0x20044d1f},
-{"linux/soundcard.h", "SOUND_MIXER_READ_ENHANCE", 0x20044d1f},
-{"linux/soundcard.h", "SOUND_MIXER_READ_LOUD", 0x20044d1f},
-{"linux/soundcard.h", "SOUND_MIXER_READ_STEREODEVS", 0x20044dfb},
-{"linux/soundcard.h", "SOUND_MIXER_READ_CAPS", 0x20044dfc},
-{"linux/soundcard.h", "SOUND_MIXER_READ_RECMASK", 0x20044dfd},
-{"linux/soundcard.h", "SOUND_MIXER_READ_DEVMASK", 0x20044dfe},
-{"linux/soundcard.h", "SOUND_MIXER_READ_RECSRC", 0x20044dff},
-{"linux/ppdev.h", "PPWCONTROL", 0x40017084},
-{"linux/ppdev.h", "PPWDATA", 0x40017086},
-{"linux/ppdev.h", "PPWCTLONIRQ", 0x40017092},
-{"linux/telephony.h", "PHONE_MAXRINGS", 0x40017185},
-{"linux/telephony.h", "PHONE_PLAY_TONE", 0x4001719b},
-{"linux/ppdev.h", "PPFCONTROL", 0x4002708e},
-{"linux/telephony.h", "PHONE_RING_CADENCE", 0x40027186},
-{"linux/agpgart.h", "AGPIOC_DEALLOCATE", 0x40044107},
-{"linux/random.h", "RNDADDTOENTCNT", 0x40045201},
-{"asm/ioctls.h", "TIOCSPTLCK", 0x40045431},
-{"linux/atmdev.h", "ATM_SETSC", 0x400461f1},
-{"linux/devfs_fs.h", "DEVFSDIOC_SET_EVENT_MASK", 0x40046402},
-{"linux/devfs_fs.h", "DEVFSDIOC_RELEASE_EVENT_QUEUE", 0x40046403},
-{"linux/video_decoder.h", "DECODER_SET_NORM", 0x40046403},
-{"linux/devfs_fs.h", "DEVFSDIOC_SET_DEBUG_MASK", 0x40046404},
-{"linux/video_decoder.h", "DECODER_SET_INPUT", 0x40046404},
-{"linux/video_decoder.h", "DECODER_SET_OUTPUT", 0x40046405},
-{"linux/video_decoder.h", "DECODER_ENABLE_OUTPUT", 0x40046406},
-{"linux/video_encoder.h", "ENCODER_SET_NORM", 0x40046502},
-{"linux/video_encoder.h", "ENCODER_SET_INPUT", 0x40046503},
-{"linux/video_encoder.h", "ENCODER_SET_OUTPUT", 0x40046504},
-{"linux/video_encoder.h", "ENCODER_ENABLE_OUTPUT", 0x40046505},
-{"linux/ncp_fs.h", "NCP_IOC_GETMOUNTUID", 0x40046e02},
-{"linux/ncp_fs.h", "NCP_IOC_SET_SIGN_WANTED", 0x40046e06},
-{"linux/ncp_fs.h", "NCP_IOC_GETDENTRYTTL", 0x40046e0c},
-{"linux/ppdev.h", "PPSETMODE", 0x40047080},
-{"linux/ppdev.h", "PPDATADIR", 0x40047090},
-{"linux/ppdev.h", "PPNEGOT", 0x40047091},
-{"linux/ppdev.h", "PPSETPHASE", 0x40047094},
-{"linux/telephony.h", "PHONE_REC_CODEC", 0x40047189},
-{"linux/telephony.h", "PHONE_REC_DEPTH", 0x4004718c},
-{"linux/telephony.h", "PHONE_FRAME", 0x4004718d},
-{"linux/telephony.h", "PHONE_REC_VOLUME", 0x4004718e},
-{"linux/telephony.h", "PHONE_PLAY_CODEC", 0x40047190},
-{"linux/telephony.h", "PHONE_PLAY_DEPTH", 0x40047193},
-{"linux/telephony.h", "PHONE_PLAY_VOLUME", 0x40047194},
-{"linux/telephony.h", "PHONE_DTMF_OOB", 0x40047199},
-{"linux/telephony.h", "PHONE_SET_TONE_ON_TIME", 0x4004719c},
-{"linux/telephony.h", "PHONE_SET_TONE_OFF_TIME", 0x4004719d},
-{"linux/telephony.h", "PHONE_PSTN_SET_STATE", 0x400471a4},
-{"linux/telephony.h", "PHONE_WINK_DURATION", 0x400471a6},
-{"linux/ixjuser.h", "IXJCTL_GET_FILTER_HIST", 0x400471c8},
-{"linux/ixjuser.h", "IXJCTL_AEC_START", 0x400471cb},
-{"linux/ixjuser.h", "IXJCTL_SET_LED", 0x400471ce},
-{"linux/ixjuser.h", "IXJCTL_MIXER", 0x400471cf},
-{"linux/ixjuser.h", "IXJCTL_DAA_COEFF_SET", 0x400471d0},
-{"linux/ixjuser.h", "IXJCTL_PORT", 0x400471d1},
-{"linux/ixjuser.h", "IXJCTL_DAA_AGAIN", 0x400471d2},
-{"linux/ixjuser.h", "IXJCTL_POTS_PSTN", 0x400471d5},
-{"linux/ixjuser.h", "IXJCTL_HZ", 0x400471e0},
-{"linux/ixjuser.h", "IXJCTL_RATE", 0x400471e1},
-{"linux/ixjuser.h", "IXJCTL_INTERCOM_START", 0x400471fd},
-{"linux/ixjuser.h", "IXJCTL_INTERCOM_STOP", 0x400471fe},
-{"linux/if_ppp.h", "PPPIOCATTCHAN", 0x40047438},
-{"linux/if_ppp.h", "PPPIOCCONNECT", 0x4004743a},
-{"linux/if_ppp.h", "PPPIOCSMRRU", 0x4004743b},
-{"linux/if_ppp.h", "PPPIOCDETACH", 0x4004743c},
-{"linux/if_ppp.h", "PPPIOCATTACH", 0x4004743d},
-{"linux/if_ppp.h", "PPPIOCSDEBUG", 0x40047440},
-{"linux/if_ppp.h", "PPPIOCSMAXCID", 0x40047451},
-{"linux/if_ppp.h", "PPPIOCSMRU", 0x40047452},
-{"linux/if_ppp.h", "PPPIOCSRASYNCMAP", 0x40047454},
-{"linux/if_ppp.h", "PPPIOCSASYNCMAP", 0x40047457},
-{"linux/if_ppp.h", "PPPIOCSFLAGS", 0x40047459},
-{"linux/isdn_ppp.h", "PPPIOCBUNDLE", 0x40047481},
-{"linux/isdn_ppp.h", "PPPIOCSMPFLAGS", 0x40047483},
-{"linux/isdn_ppp.h", "PPPIOCSMPMTU", 0x40047484},
-{"linux/isdn_ppp.h", "PPPIOCSMPMRU", 0x40047485},
-{"linux/isdn_ppp.h", "PPPIOCSCOMPRESSOR", 0x40047487},
-{"linux/videodev.h", "VIDIOCCAPTURE", 0x40047608},
-{"linux/videodev.h", "VIDIOCSYNC", 0x40047612},
-{"linux/videodev.h", "VIDIOCSWRITEMODE", 0x40047619},
-{"linux/dn.h", "SIOCSNETADDR", 0x400489e0},
-{"linux/dn.h", "OSIOCSNETADDR", 0x400489e0},
-{"linux/auto_fs4.h", "AUTOFS_IOC_EXPIRE_MULTI", 0x40049366},
-{"linux/lvm.h", "VG_CREATE", 0x4004fe00},
-{"linux/lvm.h", "VG_REMOVE", 0x4004fe01},
-{"linux/lvm.h", "VG_EXTEND", 0x4004fe03},
-{"linux/lvm.h", "VG_REDUCE", 0x4004fe04},
-{"linux/lvm.h", "VG_SET_EXTENDABLE", 0x4004fe08},
-{"linux/lvm.h", "LV_CREATE", 0x4004fe20},
-{"linux/lvm.h", "LV_REMOVE", 0x4004fe21},
-{"linux/lvm.h", "LV_EXTEND", 0x4004fe24},
-{"linux/lvm.h", "LV_REDUCE", 0x4004fe25},
-{"linux/lvm.h", "LV_SET_ACCESS", 0x4004fe28},
-{"linux/lvm.h", "LV_SET_ALLOCATION", 0x4004fe29},
-{"linux/lvm.h", "LV_SET_STATUS", 0x4004fe2a},
-{"linux/lvm.h", "LE_REMAP", 0x4004fe2b},
-{"linux/lvm.h", "PV_FLUSH", 0x4004fe42},
-{"linux/lvm.h", "PE_LOCK_UNLOCK", 0x4004fe50},
-{"linux/elevator.h", "BLKELVSET", 0x4008126b},
-{"linux/fs.h", "BLKELVSET", 0x4008126b},
-{"linux/agpgart.h", "AGPIOC_SETUP", 0x40084103},
-{"linux/agpgart.h", "AGPIOC_RESERVE", 0x40084104},
-{"linux/agpgart.h", "AGPIOC_PROTECT", 0x40084105},
-{"linux/agpgart.h", "AGPIOC_BIND", 0x40084108},
-{"linux/agpgart.h", "AGPIOC_UNBIND", 0x40084109},
-{"linux/pmu.h", "PMU_IOC_SET_BACKLIGHT", 0x40084202},
-{"linux/input.h", "EVIOCSREP", 0x40084503},
-{"linux/input.h", "EVIOCSKEYCODE", 0x40084504},
-{"linux/random.h", "RNDADDENTROPY", 0x40085203},
-{"linux/usbdevice_fs.h", "USBDEVFS_REAPURB", 0x4008550c},
-{"linux/usbdevice_fs.h", "USBDEVFS_REAPURBNDELAY", 0x4008550d},
-{"linux/usbdevice_fs.h", "USBDEVFS_CONNECTINFO", 0x40085511},
-{"linux/ext2_fs.h", "EXT2_IOC_SETFLAGS", 0x40086602},
-{"linux/mtio.h", "MTIOCTOP", 0x40086d01},
-{"linux/ncp_fs.h", "NCP_IOC_GETMOUNTUID2", 0x40086e02},
-{"linux/matroxfb.h", "MATROXFB_SET_OUTPUT_CONNECTION", 0x40086ef8},
-{"linux/matroxfb.h", "MATROXFB_SET_OUTPUT_MODE", 0x40086efa},
-{"linux/rtc.h", "RTC_IRQP_SET", 0x4008700c},
-{"linux/rtc.h", "RTC_EPOCH_SET", 0x4008700e},
-{"linux/serio.h", "SPIOCSTYPE", 0x40087101},
-{"linux/telephony.h", "PHONE_CAPABILITIES_CHECK", 0x40087182},
-{"linux/ixjuser.h", "IXJCTL_SET_FILTER", 0x400871c7},
-{"linux/ixjuser.h", "IXJCTL_INIT_TONE", 0x400871c9},
-{"linux/ixjuser.h", "IXJCTL_TONE_CADENCE", 0x400871ca},
-{"linux/if_ppp.h", "PPPIOCSNPMODE", 0x4008744b},
-{"linux/ext2_fs.h", "EXT2_IOC_SETVERSION", 0x40087602},
-{"linux/videodev.h", "VIDIOCSFREQ", 0x4008760f},
-{"linux/if_pppox.h", "PPPOEIOCSFWD", 0x4008b100},
-{"linux/fd.h", "FDFMTTRK", 0x400c0248},
-{"linux/capi.h", "CAPI_REGISTER", 0x400c4301},
-{"linux/i2o-dev.h", "I2OEVTREG", 0x400c690a},
-{"linux/ncp_fs.h", "NCP_IOC_GETROOT", 0x400c6e08},
-{"linux/videodev.h", "VIDIOCSPLAYMODE", 0x400c7618},
-{"linux/video_decoder.h", "DECODER_SET_PICTURE", 0x400e6407},
-{"linux/videodev.h", "VIDIOCSPICT", 0x400e7607},
-{"asm/dasd.h", "BIODASDFMT", 0x40104401},
-{"linux/atm_idt77105.h", "IDT77105_GETSTAT", 0x40106132},
-{"linux/atm_idt77105.h", "IDT77105_GETSTATZ", 0x40106133},
-{"linux/atmdev.h", "ATM_GETSTAT", 0x40106150},
-{"linux/atmdev.h", "ATM_GETSTATZ", 0x40106151},
-{"linux/atmdev.h", "ATM_GETLOOP", 0x40106152},
-{"linux/atmdev.h", "ATM_SETLOOP", 0x40106153},
-{"linux/atmdev.h", "ATM_QUERYLOOP", 0x40106154},
-{"linux/atm_eni.h", "ENI_MEMDUMP", 0x40106160},
-{"linux/atm_zatm.h", "ZATM_GETPOOL", 0x40106161},
-{"linux/atm_nicstar.h", "NS_SETBUFLEV", 0x40106162},
-{"linux/atm_zatm.h", "ZATM_GETPOOLZ", 0x40106162},
-{"linux/atm_zatm.h", "ZATM_SETPOOL", 0x40106163},
-{"linux/atm_zatm.h", "ZATM_GETTHIST", 0x40106164},
-{"linux/atm_eni.h", "ENI_SETMULT", 0x40106167},
-{"linux/atmdev.h", "ATM_GETLINKRATE", 0x40106181},
-{"linux/atmdev.h", "ATM_GETNAMES", 0x40106183},
-{"linux/atmdev.h", "ATM_GETTYPE", 0x40106184},
-{"linux/atmdev.h", "ATM_GETESI", 0x40106185},
-{"linux/atmdev.h", "ATM_GETADDR", 0x40106186},
-{"linux/atmdev.h", "ATM_RSTADDR", 0x40106187},
-{"linux/atmdev.h", "ATM_ADDADDR", 0x40106188},
-{"linux/atmdev.h", "ATM_DELADDR", 0x40106189},
-{"linux/atmdev.h", "ATM_GETCIRANGE", 0x4010618a},
-{"linux/atmdev.h", "ATM_SETCIRANGE", 0x4010618b},
-{"linux/atmdev.h", "ATM_SETESI", 0x4010618c},
-{"linux/atmdev.h", "ATM_SETESIF", 0x4010618d},
-{"linux/ppdev.h", "PPSETTIME", 0x40107096},
-{"linux/if_ppp.h", "PPPIOCSCOMPRESS", 0x4010744d},
-{"linux/videodev.h", "VIDIOCMCAPTURE", 0x40107613},
-{"asm/tape390.h", "TAPE390_DISPLAY", 0x40116401},
-{"linux/fd.h", "FDSETMAXERRS", 0x4014024c},
-{"linux/videodev.h", "VIDIOCSCAPTURE", 0x40147617},
-{"linux/videodev.h", "VIDIOCSFBUF", 0x4018760c},
-{"linux/fd.h", "FDSETPRM", 0x40200242},
-{"linux/fd.h", "FDDEFPRM", 0x40200243},
-{"asm/dasd.h", "BIODASDSATTR", 0x40204402},
-{"linux/if_ppp.h", "PPPIOCSXASYNCMAP", 0x4020744f},
-{"linux/videodev.h", "VIDIOCSMICROCODE", 0x4020761b},
-{"linux/videodev.h", "VIDIOCSVBIFMT", 0x4020761d},
-{"linux/joystick.h", "JSIOCSCORR", 0x40246a21},
-{"linux/rtc.h", "RTC_ALM_SET", 0x40247007},
-{"linux/rtc.h", "RTC_SET_TIME", 0x4024700a},
-{"linux/rtc.h", "RTC_WKALM_SET", 0x4028700f},
-{"linux/videodev.h", "VIDIOCSWIN", 0x4028760a},
-{"linux/videodev.h", "VIDIOCSAUDIO", 0x40287611},
-{"linux/smb_fs.h", "SMB_IOC_NEWCONN", 0x402c7502},
-{"linux/synclink.h", "MGSL_IOCSPARAMS", 0x40306d00},
-{"linux/videodev.h", "VIDIOCSCHAN", 0x40307603},
-{"linux/videodev.h", "VIDIOCSTUNER", 0x40407605},
-{"linux/fd.h", "FDSETDRVPRM", 0x40800290},
-{"linux/usbdevice_fs.h", "USBDEVFS_GETDRIVER", 0x41045508},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_VOLUME", 0x60044d00},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_BASS", 0x60044d01},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_TREBLE", 0x60044d02},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_SYNTH", 0x60044d03},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_PCM", 0x60044d04},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_SPEAKER", 0x60044d05},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_LINE", 0x60044d06},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_MIC", 0x60044d07},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_CD", 0x60044d08},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_IMIX", 0x60044d09},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_ALTPCM", 0x60044d0a},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_RECLEV", 0x60044d0b},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_IGAIN", 0x60044d0c},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_OGAIN", 0x60044d0d},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_LINE1", 0x60044d0e},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_LINE2", 0x60044d0f},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_LINE3", 0x60044d10},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_MUTE", 0x60044d1f},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_ENHANCE", 0x60044d1f},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_LOUD", 0x60044d1f},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_RECSRC", 0x60044dff},
-{"linux/joystick.h", "JSIOCGAXES", 0x80016a11},
-{"linux/joystick.h", "JSIOCGBUTTONS", 0x80016a12},
-{"linux/ppdev.h", "PPRSTATUS", 0x80017081},
-{"linux/ppdev.h", "PPRCONTROL", 0x80017083},
-{"linux/ppdev.h", "PPRDATA", 0x80017085},
-{"linux/capi.h", "CAPI_GET_ERRCODE", 0x80024321},
-{"linux/capi.h", "CAPI_INSTALLED", 0x80024322},
-{"linux/capi.h", "CAPI_GET_FLAGS", 0x80044323},
-{"linux/capi.h", "CAPI_SET_FLAGS", 0x80044324},
-{"linux/capi.h", "CAPI_CLR_FLAGS", 0x80044325},
-{"linux/capi.h", "CAPI_NCCI_OPENCOUNT", 0x80044326},
-{"linux/capi.h", "CAPI_NCCI_GETUNIT", 0x80044327},
-{"asm/dasd.h", "DASDAPIVER", 0x80044400},
-{"linux/input.h", "EVIOCGVERSION", 0x80044501},
-{"linux/random.h", "RNDGETENTCNT", 0x80045200},
-{"asm/ioctls.h", "TIOCGPTN", 0x80045430},
-{"linux/usbdevice_fs.h", "USBDEVFS_RESETEP", 0x80045503},
-{"linux/usbdevice_fs.h", "USBDEVFS_SETCONFIGURATION", 0x80045505},
-{"linux/usbdevice_fs.h", "USBDEVFS_CLAIMINTERFACE", 0x8004550f},
-{"linux/usbdevice_fs.h", "USBDEVFS_RELEASEINTERFACE", 0x80045510},
-{"linux/usbdevice_fs.h", "USBDEVFS_CLEAR_HALT", 0x80045515},
-{"linux/watchdog.h", "WDIOC_GETSTATUS", 0x80045701},
-{"linux/watchdog.h", "WDIOC_GETBOOTSTATUS", 0x80045702},
-{"linux/watchdog.h", "WDIOC_GETTEMP", 0x80045703},
-{"linux/watchdog.h", "WDIOC_SETOPTIONS", 0x80045704},
-{"linux/watchdog.h", "WDIOC_KEEPALIVE", 0x80045705},
-{"linux/sonet.h", "SONET_GETDIAG", 0x80046114},
-{"linux/sonet.h", "SONET_GETFRAMING", 0x80046116},
-{"linux/devfs_fs.h", "DEVFSDIOC_GET_PROTO_REV", 0x80046400},
-{"linux/video_decoder.h", "DECODER_GET_STATUS", 0x80046402},
-{"linux/i2o-dev.h", "I2OVALIDATE", 0x80046908},
-{"linux/joystick.h", "JSIOCGVERSION", 0x80046a01},
-{"linux/udf_fs_i.h", "UDF_GETEASIZE", 0x80046c40},
-{"linux/zftape.h", "MTIOC_ZFTAPE_GETBLKSZ", 0x80046d68},
-{"linux/ncp_fs.h", "NCP_IOC_SIGN_WANTED", 0x80046e06},
-{"linux/ncp_fs.h", "NCP_IOC_SETDENTRYTTL", 0x80046e0c},
-{"linux/ppdev.h", "PPCLRIRQ", 0x80047093},
-{"linux/telephony.h", "PHONE_DTMF_READY", 0x80047196},
-{"linux/telephony.h", "PHONE_GET_DTMF", 0x80047197},
-{"linux/telephony.h", "PHONE_GET_DTMF_ASCII", 0x80047198},
-{"linux/telephony.h", "PHONE_EXCEPTION", 0x8004719a},
-{"linux/ixjuser.h", "IXJCTL_CARDTYPE", 0x800471c1},
-{"linux/ixjuser.h", "IXJCTL_SERIAL", 0x800471c2},
-{"linux/ixjuser.h", "IXJCTL_DSP_TYPE", 0x800471c3},
-{"linux/ixjuser.h", "IXJCTL_DSP_VERSION", 0x800471c4},
-{"linux/if_ppp.h", "PPPIOCGCHAN", 0x80047437},
-{"linux/if_ppp.h", "PPPIOCGDEBUG", 0x80047441},
-{"linux/if_ppp.h", "PPPIOCGMRU", 0x80047453},
-{"linux/if_ppp.h", "PPPIOCGRASYNCMAP", 0x80047455},
-{"linux/if_ppp.h", "PPPIOCGUNIT", 0x80047456},
-{"linux/if_ppp.h", "PPPIOCGASYNCMAP", 0x80047458},
-{"linux/if_ppp.h", "PPPIOCGFLAGS", 0x8004745a},
-{"linux/isdn_ppp.h", "PPPIOCGMPFLAGS", 0x80047482},
-{"linux/smb_fs.h", "SMB_IOC_GETMOUNTUID", 0x80047501},
-{"linux/smb_fs.h", "SMB_IOC_GETMOUNTUID32", 0x80047503},
-{"linux/dn.h", "SIOCGNETADDR", 0x800489e1},
-{"linux/dn.h", "OSIOCGNETADDR", 0x800489e1},
-{"linux/auto_fs.h", "AUTOFS_IOC_PROTOVER", 0x80049363},
-{"linux/lvm.h", "LVM_GET_IOP_VERSION", 0x8004fe98},
-{"linux/sonet.h", "SONET_GETFRSENSE", 0x80066117},
-{"linux/elevator.h", "BLKELVGET", 0x8008126a},
-{"linux/fs.h", "BLKELVGET", 0x8008126a},
-{"linux/agpgart.h", "AGPIOC_INFO", 0x80084100},
-{"linux/pmu.h", "PMU_IOC_GET_BACKLIGHT", 0x80084201},
-{"linux/pmu.h", "PMU_IOC_GET_MODEL", 0x80084203},
-{"linux/pmu.h", "PMU_IOC_HAS_ADB", 0x80084204},
-{"linux/input.h", "EVIOCGID", 0x80084502},
-{"linux/input.h", "EVIOCGREP", 0x80084503},
-{"linux/input.h", "EVIOCGKEYCODE", 0x80084504},
-{"linux/input.h", "EVIOCGKEY", 0x80084505},
-{"linux/random.h", "RNDGETPOOL", 0x80085202},
-{"linux/usbdevice_fs.h", "USBDEVFS_SETINTERFACE", 0x80085504},
-{"linux/ext2_fs.h", "EXT2_IOC_GETFLAGS", 0x80086601},
-{"linux/udf_fs_i.h", "UDF_GETEABLOCK", 0x80086c41},
-{"linux/udf_fs_i.h", "UDF_GETVOLIDENT", 0x80086c42},
-{"linux/mtio.h", "MTIOCPOS", 0x80086d03},
-{"linux/matroxfb.h", "MATROXFB_GET_OUTPUT_CONNECTION", 0x80086ef8},
-{"linux/matroxfb.h", "MATROXFB_GET_AVAILABLE_OUTPUTS", 0x80086ef9},
-{"linux/matroxfb.h", "MATROXFB_GET_ALL_OUTPUTS", 0x80086efb},
-{"linux/rtc.h", "RTC_IRQP_READ", 0x8008700b},
-{"linux/rtc.h", "RTC_EPOCH_READ", 0x8008700d},
-{"linux/telephony.h", "PHONE_CAPABILITIES_LIST", 0x80087181},
-{"linux/ixjuser.h", "IXJCTL_CID", 0x800871d4},
-{"linux/ixjuser.h", "IXJCTL_FRAMES_READ", 0x800871e2},
-{"linux/ixjuser.h", "IXJCTL_FRAMES_WRITTEN", 0x800871e3},
-{"linux/ixjuser.h", "IXJCTL_READ_WAIT", 0x800871e4},
-{"linux/ixjuser.h", "IXJCTL_WRITE_WAIT", 0x800871e5},
-{"linux/ixjuser.h", "IXJCTL_DRYBUFFER_READ", 0x800871e6},
-{"linux/ext2_fs.h", "EXT2_IOC_GETVERSION", 0x80087601},
-{"linux/videodev.h", "VIDIOCGFREQ", 0x8008760e},
-{"linux/video_decoder.h", "DECODER_GET_CAPABILITIES", 0x800c6401},
-{"linux/video_encoder.h", "ENCODER_GET_CAPABILITIES", 0x800c6501},
-{"linux/ncp_fs.h", "NCP_IOC_SETROOT", 0x800c6e08},
-{"linux/videodev.h", "VIDIOCKEY", 0x800c760d},
-{"linux/videodev.h", "VIDIOCGPICT", 0x800e7606},
-{"linux/fd.h", "FDGETDRVTYP", 0x8010020f},
-{"linux/usbdevice_fs.h", "USBDEVFS_DISCSIGNAL", 0x8010550e},
-{"linux/mtio.h", "MTIOCGETSIZE", 0x80106d09},
-{"linux/ncp_fs.h", "NCP_IOC_NCPREQUEST", 0x80106e01},
-{"linux/ncp_fs.h", "NCP_IOC_SETPRIVATEDATA", 0x80106e0a},
-{"linux/ppdev.h", "PPGETTIME", 0x80107095},
-{"linux/if_ppp.h", "PPPIOCGIDLE", 0x8010743f},
-{"linux/isdn_ppp.h", "PPPIOCGIFNAME", 0x80107488},
-{"linux/fd.h", "FDGETMAXERRS", 0x8014020e},
-{"linux/mtio.h", "MTIOCVOLINFO", 0x80146d08},
-{"linux/ncp_fs.h", "NCP_IOC_LOCKUNLOCK", 0x80146e07},
-{"linux/videodev.h", "VIDIOCGUNIT", 0x80147615},
-{"linux/videodev.h", "VIDIOCGCAPTURE", 0x80147616},
-{"linux/ncp_fs.h", "NCP_IOC_SIGN_INIT", 0x80186e05},
-{"linux/ncp_fs.h", "NCP_IOC_SETOBJECTNAME", 0x80186e09},
-{"linux/videodev.h", "VIDIOCGFBUF", 0x8018760b},
-{"linux/fd.h", "FDGETPRM", 0x80200204},
-{"asm/dasd.h", "BIODASDGATTR", 0x80204405},
-{"linux/fb.h", "FBIOGET_VBLANK", 0x80204612},
-{"linux/if_ppp.h", "PPPIOCGXASYNCMAP", 0x80207450},
-{"linux/videodev.h", "VIDIOCGVBIFMT", 0x8020761c},
-{"linux/sonet.h", "SONET_GETSTAT", 0x80246110},
-{"linux/sonet.h", "SONET_GETSTATZ", 0x80246111},
-{"linux/joystick.h", "JSIOCGCORR", 0x80246a22},
-{"linux/rtc.h", "RTC_ALM_READ", 0x80247008},
-{"linux/rtc.h", "RTC_RD_TIME", 0x80247009},
-{"linux/fd.h", "FDGETFDCSTAT", 0x80280215},
-{"linux/fd.h", "FDWERRORGET", 0x80280217},
-{"linux/rtc.h", "RTC_WKALM_RD", 0x80287010},
-{"linux/videodev.h", "VIDIOCGWIN", 0x80287609},
-{"linux/videodev.h", "VIDIOCGAUDIO", 0x80287610},
-{"linux/ncp_fs.h", "NCP_IOC_SETCHARSETS", 0x802a6e0b},
-{"linux/synclink.h", "MGSL_IOCGPARAMS", 0x80306d01},
-{"linux/mtio.h", "MTIOCGET", 0x80306d02},
-{"linux/usbdevice_fs.h", "USBDEVFS_SUBMITURB", 0x8038550a},
-{"linux/videodev.h", "VIDIOCGCAP", 0x803c7601},
-{"linux/i2o-dev.h", "I2OGETIOPS", 0x80406900},
-{"linux/isdn_ppp.h", "PPPIOCGCOMPRESSORS", 0x80407486},
-{"linux/watchdog.h", "WDIOC_GETSUPPORT", 0x80485700},
-{"linux/fd.h", "FDGETDRVSTAT", 0x80500212},
-{"linux/fd.h", "FDPOLLDRVSTAT", 0x80500213},
-{"linux/i2o-dev.h", "I2OEVTGET", 0x8068690b},
-{"linux/fd.h", "FDGETDRVPRM", 0x80800211},
-{"linux/usbdevice_fs.h", "USBDEVFS_HUB_PORTINFO", 0x80805513},
-{"linux/videodev.h", "VIDIOCGMBUF", 0x80887614},
-{"asm/dasd.h", "BIODASDPSRD", 0x80c04404},
-{"linux/auto_fs.h", "AUTOFS_IOC_EXPIRE", 0x810c9365},
-{"linux/videodev.h", "VIDIOCGPLAYINFO", 0x8118761a},
-{"asm/dasd.h", "BIODASDINFO", 0x81784401},
-{"asm/dasd.h", "BIODASDINFO2", 0x81a04403},
-{"linux/msdos_fs.h", "VFAT_IOCTL_READDIR_BOTH", 0x82307201},
-{"linux/msdos_fs.h", "VFAT_IOCTL_READDIR_SHORT", 0x82307202},
-{"asm/dasd.h", "BIODASDPRRD", 0x84084402},
-{"linux/capi.h", "CAPI_GET_MANUFACTURER", 0xc0044306},
-{"linux/capi.h", "CAPI_GET_SERIAL", 0xc0044308},
-{"linux/sonet.h", "SONET_SETDIAG", 0xc0046112},
-{"linux/sonet.h", "SONET_CLRDIAG", 0xc0046113},
-{"linux/synclink.h", "MGSL_IOCWAITEVENT", 0xc0046d08},
-{"linux/if_ppp.h", "PPPIOCNEWUNIT", 0xc004743e},
-{"linux/lvm.h", "VG_STATUS", 0xc004fe05},
-{"linux/lvm.h", "VG_STATUS_GET_COUNT", 0xc004fe06},
-{"linux/lvm.h", "VG_STATUS_GET_NAMELIST", 0xc004fe07},
-{"linux/lvm.h", "LV_STATUS_BYNAME", 0xc004fe26},
-{"linux/lvm.h", "LV_STATUS_BYINDEX", 0xc004fe27},
-{"linux/lvm.h", "PV_STATUS", 0xc004fe40},
-{"linux/lvm.h", "PV_CHANGE", 0xc004fe41},
-{"linux/agpgart.h", "AGPIOC_ALLOCATE", 0xc0084106},
-{"asm/cmb.h", "BIODASDREADCMB", 0xc0084420},
-{"linux/coda.h", "CIOC_KERNEL_VERSION", 0xc008630a},
-{"linux/matroxfb.h", "MATROXFB_GET_OUTPUT_MODE", 0xc0086efa},
-{"linux/telephony.h", "PHONE_QUERY_CODEC", 0xc00871a7},
-{"linux/if_ppp.h", "PPPIOCGNPMODE", 0xc008744c},
-{"linux/auto_fs.h", "AUTOFS_IOC_SETTIMEOUT", 0xc0089364},
-{"linux/capi.h", "CAPI_GET_VERSION", 0xc0104307},
-{"linux/capi.h", "CAPI_MANUFACTURER_CMD", 0xc0104320},
-{"linux/usbdevice_fs.h", "USBDEVFS_IOCTL", 0xc0105512},
-{"linux/atm_nicstar.h", "NS_GETPSTAT", 0xc0106161},
-{"linux/ncp_fs.h", "NCP_IOC_GETPRIVATEDATA", 0xc0106e0a},
-{"linux/usbdevice_fs.h", "USBDEVFS_CONTROL", 0xc0185500},
-{"linux/usbdevice_fs.h", "USBDEVFS_BULK", 0xc0185502},
-{"linux/i2o-dev.h", "I2OHRTGET", 0xc0186901},
-{"linux/i2o-dev.h", "I2OLCTGET", 0xc0186902},
-{"linux/mtio.h", "MTIOCRDFTSEG", 0xc0186d06},
-{"linux/mtio.h", "MTIOCWRFTSEG", 0xc0186d07},
-{"linux/mtio.h", "MTIOCFTFORMAT", 0xc0186d0a},
-{"linux/ncp_fs.h", "NCP_IOC_GETOBJECTNAME", 0xc0186e09},
-{"linux/mtio.h", "MTIOCFTCMD", 0xc0206d0b},
-{"linux/i2o-dev.h", "I2OPARMSET", 0xc0286903},
-{"linux/i2o-dev.h", "I2OPARMGET", 0xc0286904},
-{"linux/ncp_fs.h", "NCP_IOC_GET_FS_INFO", 0xc0286e04},
-{"linux/ncp_fs.h", "NCP_IOC_GETCHARSETS", 0xc02a6e0b},
-{"linux/i2o-dev.h", "I2OSWDL", 0xc0306905},
-{"linux/i2o-dev.h", "I2OSWUL", 0xc0306906},
-{"linux/i2o-dev.h", "I2OSWDEL", 0xc0306907},
-{"linux/i2o-dev.h", "I2OHTML", 0xc0306909},
-{"linux/ncp_fs.h", "NCP_IOC_GET_FS_INFO_V2", 0xc0306e04},
-{"linux/videodev.h", "VIDIOCGCHAN", 0xc0307602},
-{"linux/capi.h", "CAPI_GET_PROFILE", 0xc0404309},
-{"linux/videodev.h", "VIDIOCGTUNER", 0xc0407604},
-{"asm/cmb.h", "BIODASDREADALLCMB", 0xc0584421},
-{"linux/isdn_ppp.h", "PPPIOCGCALLINFO", 0xc0887480},
--- a/linux/s390/ioctlent.h.in
+++ b/linux/s390/ioctlent.h.in
@ -0,0 +1,125 @@
+	{"asm/dasd.h",	"BIODASDDISABLE",	0x4400},
+	{"asm/dasd.h",	"DASDAPIVER",	0x4400},
+	{"asm/dasd.h",	"BIODASDENABLE",	0x4401},
+	{"asm/dasd.h",	"BIODASDFMT",	0x4401},
+	{"asm/dasd.h",	"BIODASDINFO",	0x4401},
+	{"asm/dasd.h",	"BIODASDSNID",	0x4401},
+	{"asm/dasd.h",	"BIODASDPRRD",	0x4402},
+	{"asm/dasd.h",	"BIODASDRSRV",	0x4402},
+	{"asm/dasd.h",	"BIODASDSATTR",	0x4402},
+	{"asm/dasd.h",	"BIODASDINFO2",	0x4403},
+	{"asm/dasd.h",	"BIODASDRLSE",	0x4403},
+	{"asm/dasd.h",	"BIODASDPSRD",	0x4404},
+	{"asm/dasd.h",	"BIODASDSLCK",	0x4404},
+	{"asm/dasd.h",	"BIODASDGATTR",	0x4405},
+	{"asm/dasd.h",	"BIODASDPRRST",	0x4405},
+	{"asm/dasd.h",	"BIODASDQUIESCE",	0x4406},
+	{"asm/dasd.h",	"BIODASDRESUME",	0x4407},
+	{"asm/cmb.h",	"BIODASDCMFENABLE",	0x4420},
+	{"asm/cmb.h",	"BIODASDCMFDISABLE",	0x4421},
+	{"asm/cmb.h",	"BIODASDREADALLCMB",	0x4421},
+	{"asm/dasd.h",	"BIODASDSYMMIO",	0x44f0},
+	{"asm-generic/ioctls.h",	"TCGETS",	0x5401},
+	{"asm-generic/ioctls.h",	"TCSETS",	0x5402},
+	{"asm-generic/ioctls.h",	"TCSETSW",	0x5403},
+	{"asm-generic/ioctls.h",	"TCSETSF",	0x5404},
+	{"asm-generic/ioctls.h",	"TCGETA",	0x5405},
+	{"asm-generic/ioctls.h",	"TCSETA",	0x5406},
+	{"asm-generic/ioctls.h",	"TCSETAW",	0x5407},
+	{"asm-generic/ioctls.h",	"TCSETAF",	0x5408},
+	{"asm-generic/ioctls.h",	"TCSBRK",	0x5409},
+	{"asm-generic/ioctls.h",	"TCXONC",	0x540a},
+	{"asm-generic/ioctls.h",	"TCFLSH",	0x540b},
+	{"asm-generic/ioctls.h",	"TIOCEXCL",	0x540c},
+	{"asm-generic/ioctls.h",	"TIOCNXCL",	0x540d},
+	{"asm-generic/ioctls.h",	"TIOCSCTTY",	0x540e},
+	{"asm-generic/ioctls.h",	"TIOCGPGRP",	0x540f},
+	{"asm-generic/ioctls.h",	"TIOCSPGRP",	0x5410},
+	{"asm-generic/ioctls.h",	"TIOCOUTQ",	0x5411},
+	{"asm-generic/ioctls.h",	"TIOCSTI",	0x5412},
+	{"asm-generic/ioctls.h",	"TIOCGWINSZ",	0x5413},
+	{"asm-generic/ioctls.h",	"TIOCSWINSZ",	0x5414},
+	{"asm-generic/ioctls.h",	"TIOCMGET",	0x5415},
+	{"asm-generic/ioctls.h",	"TIOCMBIS",	0x5416},
+	{"asm-generic/ioctls.h",	"TIOCMBIC",	0x5417},
+	{"asm-generic/ioctls.h",	"TIOCMSET",	0x5418},
+	{"asm-generic/ioctls.h",	"TIOCGSOFTCAR",	0x5419},
+	{"asm-generic/ioctls.h",	"TIOCSSOFTCAR",	0x541a},
+	{"asm-generic/ioctls.h",	"FIONREAD",	0x541b},
+	{"asm-generic/ioctls.h",	"TIOCLINUX",	0x541c},
+	{"asm-generic/ioctls.h",	"TIOCCONS",	0x541d},
+	{"asm-generic/ioctls.h",	"TIOCGSERIAL",	0x541e},
+	{"asm-generic/ioctls.h",	"TIOCSSERIAL",	0x541f},
+	{"asm-generic/ioctls.h",	"TIOCPKT",	0x5420},
+	{"asm-generic/ioctls.h",	"FIONBIO",	0x5421},
+	{"asm-generic/ioctls.h",	"TIOCNOTTY",	0x5422},
+	{"asm-generic/ioctls.h",	"TIOCSETD",	0x5423},
+	{"asm-generic/ioctls.h",	"TIOCGETD",	0x5424},
+	{"asm-generic/ioctls.h",	"TCSBRKP",	0x5425},
+	{"asm-generic/ioctls.h",	"TIOCSBRK",	0x5427},
+	{"asm-generic/ioctls.h",	"TIOCCBRK",	0x5428},
+	{"asm-generic/ioctls.h",	"TIOCGSID",	0x5429},
+	{"asm-generic/ioctls.h",	"TCGETS2",	0x542a},
+	{"asm-generic/ioctls.h",	"TCSETS2",	0x542b},
+	{"asm-generic/ioctls.h",	"TCSETSW2",	0x542c},
+	{"asm-generic/ioctls.h",	"TCSETSF2",	0x542d},
+	{"asm-generic/ioctls.h",	"TIOCGRS485",	0x542e},
+	{"asm-generic/ioctls.h",	"TIOCSRS485",	0x542f},
+	{"asm-generic/ioctls.h",	"TIOCGPTN",	0x5430},
+	{"asm-generic/ioctls.h",	"TIOCSPTLCK",	0x5431},
+	{"asm-generic/ioctls.h",	"TCGETX",	0x5432},
+	{"asm-generic/ioctls.h",	"TIOCGDEV",	0x5432},
+	{"asm-generic/ioctls.h",	"TCSETX",	0x5433},
+	{"asm-generic/ioctls.h",	"TCSETXF",	0x5434},
+	{"asm-generic/ioctls.h",	"TCSETXW",	0x5435},
+	{"asm-generic/ioctls.h",	"TIOCSIG",	0x5436},
+	{"asm-generic/ioctls.h",	"FIONCLEX",	0x5450},
+	{"asm-generic/ioctls.h",	"FIOCLEX",	0x5451},
+	{"asm-generic/ioctls.h",	"FIOASYNC",	0x5452},
+	{"asm-generic/ioctls.h",	"TIOCSERCONFIG",	0x5453},
+	{"asm-generic/ioctls.h",	"TIOCSERGWILD",	0x5454},
+	{"asm-generic/ioctls.h",	"TIOCSERSWILD",	0x5455},
+	{"asm-generic/ioctls.h",	"TIOCGLCKTRMIOS",	0x5456},
+	{"asm-generic/ioctls.h",	"TIOCSLCKTRMIOS",	0x5457},
+	{"asm-generic/ioctls.h",	"TIOCSERGSTRUCT",	0x5458},
+	{"asm-generic/ioctls.h",	"TIOCSERGETLSR",	0x5459},
+	{"asm-generic/ioctls.h",	"TIOCSERGETMULTI",	0x545a},
+	{"asm-generic/ioctls.h",	"TIOCSERSETMULTI",	0x545b},
+	{"asm-generic/ioctls.h",	"TIOCMIWAIT",	0x545c},
+	{"asm-generic/ioctls.h",	"TIOCGICOUNT",	0x545d},
+	{"asm/ioctls.h",	"FIOQSIZE",	0x545e},
+	{"asm-generic/ioctls.h",	"FIOQSIZE",	0x5460},
+	{"asm/chsc.h",	"CHSC_START",	0x6381},
+	{"asm/chsc.h",	"CHSC_INFO_CHANNEL_PATH",	0x6382},
+	{"asm/chsc.h",	"CHSC_INFO_CU",	0x6383},
+	{"asm/chsc.h",	"CHSC_INFO_SCH_CU",	0x6384},
+	{"asm/chsc.h",	"CHSC_INFO_CI",	0x6385},
+	{"asm/chsc.h",	"CHSC_INFO_CCL",	0x6386},
+	{"asm/chsc.h",	"CHSC_INFO_CPD",	0x6387},
+	{"asm/chsc.h",	"CHSC_INFO_DCAL",	0x6388},
+	{"asm/tape390.h",	"TAPE390_DISPLAY",	0x6401},
+	{"asm/tape390.h",	"TAPE390_CRYPT_SET",	0x6402},
+	{"asm/tape390.h",	"TAPE390_CRYPT_QUERY",	0x6403},
+	{"asm/tape390.h",	"TAPE390_KEKL_SET",	0x6404},
+	{"asm/tape390.h",	"TAPE390_KEKL_QUERY",	0x6405},
+	{"asm/zcrypt.h",	"Z90STAT_TOTALCOUNT",	0x7a40},
+	{"asm/zcrypt.h",	"Z90STAT_PCICACOUNT",	0x7a41},
+	{"asm/zcrypt.h",	"Z90STAT_PCICCCOUNT",	0x7a42},
+	{"asm/zcrypt.h",	"Z90STAT_REQUESTQ_COUNT",	0x7a44},
+	{"asm/zcrypt.h",	"Z90STAT_PENDINGQ_COUNT",	0x7a45},
+	{"asm/zcrypt.h",	"Z90STAT_TOTALOPEN_COUNT",	0x7a46},
+	{"asm/zcrypt.h",	"Z90STAT_DOMAIN_INDEX",	0x7a47},
+	{"asm/zcrypt.h",	"Z90STAT_STATUS_MASK",	0x7a48},
+	{"asm/zcrypt.h",	"Z90STAT_QDEPTH_MASK",	0x7a49},
+	{"asm/zcrypt.h",	"Z90STAT_PERDEV_REQCNT",	0x7a4a},
+	{"asm/zcrypt.h",	"Z90STAT_PCIXCCMCL2COUNT",	0x7a4b},
+	{"asm/zcrypt.h",	"Z90STAT_PCIXCCMCL3COUNT",	0x7a4c},
+	{"asm/zcrypt.h",	"Z90STAT_CEX2CCOUNT",	0x7a4d},
+	{"asm/zcrypt.h",	"Z90STAT_CEX2ACOUNT",	0x7a4e},
+	{"asm-generic/sockios.h",	"FIOSETOWN",	0x8901},
+	{"asm-generic/sockios.h",	"SIOCSPGRP",	0x8902},
+	{"asm-generic/sockios.h",	"FIOGETOWN",	0x8903},
+	{"asm-generic/sockios.h",	"SIOCGPGRP",	0x8904},
+	{"asm-generic/sockios.h",	"SIOCATMARK",	0x8905},
+	{"asm-generic/sockios.h",	"SIOCGSTAMP",	0x8906},
+	{"asm-generic/sockios.h",	"SIOCGSTAMPNS",	0x8907},
--- a/linux/s390/syscallent.h
+++ b/linux/s390/syscallent.h
@ -45,25 +45,25 @@
 	{ 3,	TF,	sys_mknod,		"mknod"		}, /* 14 */
 	{ 2,	TF,	sys_chmod,		"chmod"		}, /* 15 */
 	{ 3,	TF,	sys_chown,		"lchown"	}, /* 16 */
-	{ -1,	0,	printargs,		"SYS_17"	}, /* 17 */
-	{ -1,	0,	printargs,		"SYS_18"	}, /* 18 */
+	{ MA,	0,	NULL,			NULL		}, /* 17 */
+	{ MA,	0,	NULL,			NULL		}, /* 18 */
 	{ 3,	TD,	sys_lseek,		"lseek"		}, /* 19 */
 	{ 0,	0,	sys_getpid,		"getpid"	}, /* 20 */
 	{ 5,	TF,	sys_mount,		"mount"		}, /* 21 */
 	{ 1,	TF,	sys_umount,		"oldumount"	}, /* 22 */
 	{ 1,	0,	sys_setuid,		"setuid"	}, /* 23 */
-	{ 0,	0,	sys_getuid,		"getuid"	}, /* 24 */
+	{ 0,	NF,	sys_getuid,		"getuid"	}, /* 24 */
 	{ 1,	0,	sys_stime,		"stime"		}, /* 25 */
 	{ 4,	0,	sys_ptrace,		"ptrace"	}, /* 26 */
 	{ 1,	0,	sys_alarm,		"alarm"		}, /* 27 */
-	{ -1,	0,	printargs,		"SYS_28"	}, /* 28 */
+	{ MA,	0,	NULL,			NULL		}, /* 28 */
 	{ 0,	TS,	sys_pause,		"pause"		}, /* 29 */
 	{ 2,	TF,	sys_utime,		"utime"		}, /* 30 */
-	{ -1,	0,	printargs,		"SYS_31"	}, /* 31 */
-	{ -1,	0,	printargs,		"SYS_32"	}, /* 32 */
+	{ MA,	0,	NULL,			NULL		}, /* 31 */
+	{ MA,	0,	NULL,			NULL		}, /* 32 */
 	{ 2,	TF,	sys_access,		"access"	}, /* 33 */
 	{ 1,	0,	sys_nice,		"nice"		}, /* 34 */
-	{ -1,	0,	printargs,		"SYS_35"	}, /* 35 */
+	{ MA,	0,	NULL,			NULL		}, /* 35 */
 	{ 0,	0,	sys_sync,		"sync"		}, /* 36 */
 	{ 2,	TS,	sys_kill,		"kill"		}, /* 37 */
 	{ 2,	TF,	sys_rename,		"rename"	}, /* 38 */
@ -72,22 +72,22 @@
 	{ 1,	TD,	sys_dup,		"dup"		}, /* 41 */
 	{ 1,	TD,	sys_pipe,		"pipe"		}, /* 42 */
 	{ 1,	0,	sys_times,		"times"		}, /* 43 */
-	{ -1,	0,	printargs,		"SYS_44"	}, /* 44 */
+	{ MA,	0,	NULL,			NULL		}, /* 44 */
 	{ 1,	0,	sys_brk,		"brk"		}, /* 45 */
-	{ -1,	0,	printargs,		"SYS_46"	}, /* 46 */
-	{ -1,	0,	printargs,		"SYS_47"	}, /* 47 */
+	{ MA,	0,	NULL,			NULL		}, /* 46 */
+	{ MA,	0,	NULL,			NULL		}, /* 47 */
 	{ 3,	TS,	sys_signal,		"signal"	}, /* 48 */
-	{ 0,	0,	sys_geteuid,		"geteuid"	}, /* 49 */
-	{ 0,	0,	sys_getegid,		"getegid"	}, /* 50 */
+	{ 0,	NF,	sys_geteuid,		"geteuid"	}, /* 49 */
+	{ 0,	NF,	sys_getegid,		"getegid"	}, /* 50 */
 	{ 1,	TF,	sys_acct,		"acct"		}, /* 51 */
 	{ 2,	TF,	sys_umount2,		"umount"	}, /* 52 */
-	{ -1,	0,	printargs,		"SYS_53"	}, /* 53 */
+	{ MA,	0,	NULL,			NULL		}, /* 53 */
 	{ 3,	TD,	sys_ioctl,		"ioctl"		}, /* 54 */
 	{ 3,	TD,	sys_fcntl,		"fcntl"		}, /* 55 */
-	{ -1,	0,	printargs,		"SYS_56"	}, /* 56 */
+	{ MA,	0,	NULL,			NULL		}, /* 56 */
 	{ 2,	0,	sys_setpgid,		"setpgid"	}, /* 57 */
-	{ -1,	0,	printargs,		"SYS_58"	}, /* 58 */
-	{ -1,	0,	printargs,		"SYS_59"	}, /* 59 */
+	{ MA,	0,	NULL,			NULL		}, /* 58 */
+	{ MA,	0,	NULL,			NULL		}, /* 59 */
 	{ 1,	0,	sys_umask,		"umask"		}, /* 60 */
 	{ 1,	TF,	sys_chroot,		"chroot"	}, /* 61 */
 	{ 2,	0,	sys_ustat,		"ustat"		}, /* 62 */
@ -96,8 +96,8 @@
 	{ 0,	0,	sys_getpgrp,		"getpgrp"	}, /* 65 */
 	{ 0,	0,	sys_setsid,		"setsid"	}, /* 66 */
 	{ 3,	TS,	sys_sigaction,		"sigaction"	}, /* 67 */
-	{ -1,	0,	printargs,		"SYS_68"	}, /* 68 */
-	{ -1,	0,	printargs,		"SYS_69"	}, /* 69 */
+	{ MA,	0,	NULL,			NULL		}, /* 68 */
+	{ MA,	0,	NULL,			NULL		}, /* 69 */
 	{ 2,	0,	sys_setreuid,		"setreuid"	}, /* 70 */
 	{ 2,	0,	sys_setregid,		"setregid"	}, /* 71 */
 	{ 3,	TS,	sys_sigsuspend,		"sigsuspend"	}, /* 72 */
@ -110,13 +110,13 @@
 	{ 2,	0,	sys_settimeofday,	"settimeofday"	}, /* 79 */
 	{ 2,	0,	sys_getgroups,		"getgroups"	}, /* 80 */
 	{ 2,	0,	sys_setgroups,		"setgroups"	}, /* 81 */
-	{ -1,	0,	printargs,		"SYS_82"	}, /* 82 */
+	{ MA,	0,	NULL,			NULL		}, /* 82 */
 	{ 2,	TF,	sys_symlink,		"symlink"	}, /* 83 */
-	{ -1,	0,	printargs,		"SYS_84"	}, /* 84 */
+	{ MA,	0,	NULL,			NULL		}, /* 84 */
 	{ 3,	TF,	sys_readlink,		"readlink"	}, /* 85 */
 	{ 1,	TF,	sys_uselib,		"uselib"	}, /* 86 */
-	{ 1,	TF,	sys_swapon,		"swapon"	}, /* 87 */
-	{ 3,	0,	sys_reboot,		"reboot"	}, /* 88 */
+	{ 2,	TF,	sys_swapon,		"swapon"	}, /* 87 */
+	{ 4,	0,	sys_reboot,		"reboot"	}, /* 88 */
 	{ 3,	TD,	sys_readdir,		"readdir"	}, /* 89 */
 	{ 6,	TD,	sys_old_mmap,		"mmap"		}, /* 90 */
 	{ 2,	0,	sys_munmap,		"munmap"	}, /* 91 */
@ -126,7 +126,7 @@
 	{ 3,	TD,	sys_fchown,		"fchown"	}, /* 95 */
 	{ 2,	0,	sys_getpriority,	"getpriority"	}, /* 96 */
 	{ 3,	0,	sys_setpriority,	"setpriority"	}, /* 97 */
-	{ -1,	0,	printargs,		"SYS_98"	}, /* 98 */
+	{ MA,	0,	NULL,			NULL		}, /* 98 */
 	{ 2,	TF,	sys_statfs,		"statfs"	}, /* 99 */
 	{ 2,	TD,	sys_fstatfs,		"fstatfs"	}, /* 100 */
 	{ 3,	0,	sys_ioperm,		"ioperm"	}, /* 101 */
@ -137,21 +137,21 @@
 	{ 2,	TF,	sys_stat,		"stat"		}, /* 106 */
 	{ 2,	TF,	sys_lstat,		"lstat"		}, /* 107 */
 	{ 2,	TD,	sys_fstat,		"fstat"		}, /* 108 */
-	{ -1,	0,	printargs,		"SYS_109"	}, /* 109 */
-	{ -1,	0,	printargs,		"SYS_110"	}, /* 110 */
+	{ MA,	0,	NULL,			NULL		}, /* 109 */
+	{ MA,	0,	NULL,			NULL		}, /* 110 */
 	{ 0,	0,	sys_vhangup,		"vhangup"	}, /* 111 */
 	{ 0,	0,	sys_idle,		"idle"		}, /* 112 */
-	{ -1,	0,	printargs,		"SYS_113"	}, /* 113 */
+	{ MA,	0,	NULL,			NULL		}, /* 113 */
 	{ 4,	TP,	sys_wait4,		"wait4"		}, /* 114 */
-	{ 1,	0,	sys_swapoff,		"swapoff"	}, /* 115 */
+	{ 1,	TF,	sys_swapoff,		"swapoff"	}, /* 115 */
 	{ 1,	0,	sys_sysinfo,		"sysinfo"	}, /* 116 */
-	{ 5,	0,	sys_ipc,		"ipc"		}, /* 117 */
+	{ 5,	TI,	sys_ipc,		"ipc"		}, /* 117 */
 	{ 1,	TD,	sys_fsync,		"fsync"		}, /* 118 */
-	{ 1,	TS,	sys_sigreturn,		"sigreturn"	}, /* 119 */
+	{ 0,	TS,	sys_sigreturn,		"sigreturn"	}, /* 119 */
 	{ 5,	TP,	sys_clone,		"clone"		}, /* 120 */
 	{ 2,	0,	sys_setdomainname,	"setdomainname"	}, /* 121 */
 	{ 1,	0,	sys_uname,		"uname"		}, /* 122 */
-	{ -1,	0,	printargs,		"SYS_123"	}, /* 123 */
+	{ MA,	0,	NULL,			NULL		}, /* 123 */
 	{ 1,	0,	sys_adjtimex,		"adjtimex"	}, /* 124 */
 	{ 3,	0,	sys_mprotect,		"mprotect"	}, /* 125 */
 	{ 3,	TS,	sys_sigprocmask,	"sigprocmask"	}, /* 126 */
@ -166,8 +166,8 @@
 	{ 3,	0,	sys_sysfs,		"sysfs"		}, /* 135 */
 	{ 1,	0,	sys_personality,	"personality"	}, /* 136 */
 	{ 5,	0,	sys_afs_syscall,	"afs_syscall"	}, /* 137 */
-	{ 1,	0,	sys_setfsuid,		"setfsuid"	}, /* 138 */
-	{ 1,	0,	sys_setfsgid,		"setfsgid"	}, /* 139 */
+	{ 1,	NF,	sys_setfsuid,		"setfsuid"	}, /* 138 */
+	{ 1,	NF,	sys_setfsgid,		"setfsgid"	}, /* 139 */
 	{ 5,	TD,	sys_llseek,		"_llseek"	}, /* 140 */
 	{ 3,	TD,	sys_getdents,		"getdents"	}, /* 141 */
 	{ 5,	TD,	sys_select,		"select"	}, /* 142 */
@ -180,7 +180,7 @@
 	{ 1,	0,	sys_sysctl,		"_sysctl"	}, /* 149 */
 	{ 2,	0,	sys_mlock,		"mlock"		}, /* 150 */
 	{ 2,	0,	sys_munlock,		"munlock"	}, /* 151 */
-	{ 2,	0,	sys_mlockall,		"mlockall"	}, /* 152 */
+	{ 1,	0,	sys_mlockall,		"mlockall"	}, /* 152 */
 	{ 0,	0,	sys_munlockall,		"munlockall"	}, /* 153 */
 	{ 0,	0,	sys_sched_setparam,	"sched_setparam"}, /* 154 */
 	{ 2,	0,	sys_sched_getparam,	"sched_getparam"}, /* 155 */
@ -191,17 +191,17 @@
 	{ 1,	0,	sys_sched_get_priority_min,"sched_get_priority_min"}, /* 160 */
 	{ 2,	0,	sys_sched_rr_get_interval,"sched_rr_get_interval"}, /* 161 */
 	{ 2,	0,	sys_nanosleep,		"nanosleep"	}, /* 162 */
-	{ 4,	0,	sys_mremap,		"mremap"	}, /* 163 */
+	{ 5,	0,	sys_mremap,		"mremap"	}, /* 163 */
 	{ 3,	0,	sys_setresuid,		"setresuid"	}, /* 164 */
 	{ 3,	0,	sys_getresuid,		"getresuid"	}, /* 165 */
-	{ -1,	0,	printargs,		"SYS_166"	}, /* 166 */
+	{ MA,	0,	NULL,			NULL		}, /* 166 */
 	{ 5,	0,	sys_query_module,	"query_module"	}, /* 167 */
 	{ 3,	TD,	sys_poll,		"poll"		}, /* 168 */
-	{ 3,	0,	printargs,		"nfsservctl"	}, /* 169 */
+	{ 3,	0,	sys_nfsservctl,		"nfsservctl"	}, /* 169 */
 	{ 3,	0,	sys_setresgid,		"setresgid"	}, /* 170 */
 	{ 3,	0,	sys_getresgid,		"getresgid"	}, /* 171 */
 	{ 5,	0,	sys_prctl,		"prctl"		}, /* 172 */
-	{ 1,	TS,	sys_sigreturn,		"rt_sigreturn"	}, /* 173 */
+	{ 0,	TS,	sys_sigreturn,		"rt_sigreturn"	}, /* 173 */
 	{ 4,	TS,	sys_rt_sigaction,	"rt_sigaction"	}, /* 174 */
 	{ 4,	TS,	sys_rt_sigprocmask,	"rt_sigprocmask"}, /* 175 */
 	{ 2,	TS,	sys_rt_sigpending,	"rt_sigpending"	}, /* 176 */
@ -220,17 +220,17 @@
 	{ 5,	0,	sys_putpmsg,		"putpmsg"	}, /* 189 */
 	{ 0,	TP,	sys_vfork,		"vfork"		}, /* 190 */
 	{ 2,	0,	sys_getrlimit,		"getrlimit"	}, /* 191 */
-	{ 6,	0,	sys_mmap,		"mmap2"		}, /* 192 */
+	{ 6,	TD,	sys_mmap,		"mmap2"		}, /* 192 */
 	{ 2,	TF,	sys_truncate64,		"truncate64"	}, /* 193 */
 	{ 2,	TD,	sys_ftruncate64,	"ftruncate64"	}, /* 194 */
 	{ 2,	TF,	sys_stat64,		"stat64"	}, /* 195 */
 	{ 2,	TF,	sys_lstat64,		"lstat64"	}, /* 196 */
 	{ 2,	TD,	sys_fstat64,		"fstat64"	}, /* 197 */
 	{ 3,	TF,	sys_chown,		"lchown"	}, /* 198 */
-	{ 0,	0,	sys_getuid,		"getuid"	}, /* 199 */
-	{ 0,	0,	sys_getgid,		"getgid"	}, /* 200 */
-	{ 0,	0,	sys_geteuid,		"geteuid"	}, /* 201 */
-	{ 0,	0,	sys_getegid,		"getegid"	}, /* 202 */
+	{ 0,	NF,	sys_getuid,		"getuid"	}, /* 199 */
+	{ 0,	NF,	sys_getgid,		"getgid"	}, /* 200 */
+	{ 0,	NF,	sys_geteuid,		"geteuid"	}, /* 201 */
+	{ 0,	NF,	sys_getegid,		"getegid"	}, /* 202 */
 	{ 2,	0,	sys_setreuid,		"setreuid"	}, /* 203 */
 	{ 2,	0,	sys_setregid,		"setregid"	}, /* 204 */
 	{ 2,	0,	sys_getgroups,		"getgroups"	}, /* 205 */
@ -243,10 +243,10 @@
 	{ 3,	TF,	sys_chown,		"chown"		}, /* 212 */
 	{ 1,	0,	sys_setuid,		"setuid"	}, /* 213 */
 	{ 1,	0,	sys_setgid,		"setgid"	}, /* 214 */
-	{ 1,	0,	sys_setfsuid,		"setfsuid"	}, /* 215 */
-	{ 1,	0,	sys_setfsgid,		"setfsgid"	}, /* 216 */
+	{ 1,	NF,	sys_setfsuid,		"setfsuid"	}, /* 215 */
+	{ 1,	NF,	sys_setfsgid,		"setfsgid"	}, /* 216 */
 	{ 2,	TF,	sys_pivotroot,		"pivot_root"	}, /* 217 */
-	{ 3,	0,	sys_mincore,	         "mincore"      }, /* 218 */
+	{ 3,	0,	sys_mincore,		"mincore"	}, /* 218 */
 	{ 3,	0,	sys_madvise,		"madvise"	}, /* 219 */
 	{ 3,	TD,	sys_getdents64,		"getdents64"	}, /* 220 */
 	{ 3,	TD,	sys_fcntl,		"fcntl64"	}, /* 221 */
@ -257,31 +257,31 @@
 	{ 5,	TD,	sys_fsetxattr,		"fsetxattr"	}, /* 226 */
 	{ 4,	TF,	sys_getxattr,		"getxattr"	}, /* 227 */
 	{ 4,	TF,	sys_getxattr,		"lgetxattr"	}, /* 228 */
-	{ 4,	0,	sys_fgetxattr,		"fgetxattr"	}, /* 229 */
+	{ 4,	TD,	sys_fgetxattr,		"fgetxattr"	}, /* 229 */
 	{ 3,	TF,	sys_listxattr,		"listxattr"	}, /* 230 */
 	{ 3,	TF,	sys_listxattr,		"llistxattr"	}, /* 231 */
-	{ 3,	0,	sys_flistxattr,		"flistxattr"	}, /* 232 */
+	{ 3,	TD,	sys_flistxattr,		"flistxattr"	}, /* 232 */
 	{ 2,	TF,	sys_removexattr,	"removexattr"	}, /* 233 */
 	{ 2,	TF,	sys_removexattr,	"lremovexattr"	}, /* 234 */
 	{ 2,	TD,	sys_fremovexattr,	"fremovexattr"	}, /* 235 */
-	{ 0,	0,	printargs,		"gettid"	}, /* 236 */
+	{ 0,	0,	sys_gettid,		"gettid"	}, /* 236 */
 	{ 2,	TS,	sys_kill,		"tkill"		}, /* 237 */
 	{ 6,	0,	sys_futex,		"futex"		}, /* 238 */
 	{ 3,	0,	sys_sched_setaffinity,	"sched_setaffinity" },/* 239 */
 	{ 3,	0,	sys_sched_getaffinity,	"sched_getaffinity" },/* 240 */
 	{ 3,	TS,	sys_tgkill,		"tgkill"	}, /* 241 */
-	{ -1,	0,	printargs,		"SYS_242"	}, /* 242 */
+	{ MA,	0,	NULL,			NULL		}, /* 242 */
 	{ 2,	0,	sys_io_setup,		"io_setup"	}, /* 243 */
 	{ 1,	0,	sys_io_destroy,		"io_destroy"	}, /* 244 */
 	{ 5,	0,	sys_io_getevents,	"io_getevents"	}, /* 245 */
 	{ 3,	0,	sys_io_submit,		"io_submit"	}, /* 246 */
 	{ 3,	0,	sys_io_cancel,		"io_cancel"	}, /* 247 */
 	{ 1,	TP,	sys_exit,		"exit_group"	}, /* 248 */
-	{ 1,	0,	sys_epoll_create,	"epoll_create"	}, /* 249 */
+	{ 1,	TD,	sys_epoll_create,	"epoll_create"	}, /* 249 */
 	{ 4,	TD,	sys_epoll_ctl,		"epoll_ctl"	}, /* 250 */
 	{ 4,	TD,	sys_epoll_wait,		"epoll_wait"	}, /* 251 */
-	{ 1,	0,	printargs,		"set_tid_address"}, /* 252 */
-	{ 5,	0,	printargs,		"fadvise64"	}, /* 253 */
+	{ 1,	0,	sys_set_tid_address,	"set_tid_address"}, /* 252 */
+	{ 5,	TD,	printargs,		"fadvise64"	}, /* 253 */
 	{ 3,	0,	sys_timer_create,	"timer_create"	}, /* 254 */
 	{ 4,	0,	sys_timer_settime,	"timer_settime"	}, /* 255 */
 	{ 2,	0,	sys_timer_gettime,	"timer_gettime"	}, /* 256 */
@ -291,8 +291,8 @@
 	{ 2,	0,	sys_clock_gettime,	"clock_gettime"	}, /* 260 */
 	{ 2,	0,	sys_clock_getres,	"clock_getres"	}, /* 261 */
 	{ 4,	0,	sys_clock_nanosleep,	"clock_nanosleep"}, /* 262 */
-	{ 5,	0,	printargs,		"vserver"	}, /* 263 */
-	{ 5,	0,	printargs,		"fadvise64_64"	}, /* 264 */
+	{ 5,	0,	sys_vserver,		"vserver"	}, /* 263 */
+	{ 5,	TD,	printargs,		"fadvise64_64"	}, /* 264 */
 	{ 3,	TF,	sys_statfs64,		"statfs64"	}, /* 265 */
 	{ 3,	TF,	sys_fstatfs64,		"fstatfs64"	}, /* 266 */
 	{ 5,	0,	sys_remap_file_pages,	"remap_file_pages"}, /* 267 */
@ -305,23 +305,23 @@
 	{ 5,	0,	sys_mq_timedreceive,	"mq_timedreceive" }, /* 274 */
 	{ 2,	0,	sys_mq_notify,		"mq_notify"	}, /* 275 */
 	{ 3,	0,	sys_mq_getsetattr,	"mq_getsetattr"	}, /* 276 */
-	{ 5,	0,	printargs,		"sys_kexec_load" }, /* 277 */
-	{ 5,	0,	printargs,		"add_key"	}, /* 278 */
-	{ 4,	0,	printargs,		"request_key"	}, /* 279 */
-	{ 5,	0,	printargs,		"keyctl"	}, /* 280 */
+	{ 4,	0,	sys_kexec_load,		"kexec_load"	}, /* 277 */
+	{ 5,	0,	sys_add_key,		"add_key"	}, /* 278 */
+	{ 4,	0,	sys_request_key,	"request_key"	}, /* 279 */
+	{ 5,	0,	sys_keyctl,		"keyctl"	}, /* 280 */
 	{ 5,	TP,	sys_waitid,		"waitid"	}, /* 281 */
-	{ 3,	0,	printargs,		"ioprio_set"	}, /* 282 */
-	{ 2,	0,	printargs,		"ioprio_get"	}, /* 283 */
-	{ 0,	TD,	printargs,		"inotify_init"	}, /* 284 */
+	{ 3,	0,	sys_ioprio_set,		"ioprio_set"	}, /* 282 */
+	{ 2,	0,	sys_ioprio_get,		"ioprio_get"	}, /* 283 */
+	{ 0,	TD,	sys_inotify_init,	"inotify_init"	}, /* 284 */
 	{ 3,	TD,	sys_inotify_add_watch,	"inotify_add_watch" }, /* 285 */
 	{ 2,	TD,	sys_inotify_rm_watch,	"inotify_rm_watch" }, /* 286 */
-	{ 4,	0,	printargs,		"migrate_pages"	}, /* 287 */
+	{ 4,	0,	sys_migrate_pages,	"migrate_pages"	}, /* 287 */
 	{ 4,	TD|TF,	sys_openat,		"openat"	}, /* 288 */
 	{ 3,	TD|TF,	sys_mkdirat,		"mkdirat"	}, /* 289 */
 	{ 4,	TD|TF,	sys_mknodat,		"mknodat"	}, /* 290 */
 	{ 5,	TD|TF,	sys_fchownat,		"fchownat"	}, /* 291 */
 	{ 3,	TD|TF,	sys_futimesat,		"futimesat"	}, /* 292 */
-	{ 4,	TD|TD,	sys_newfstatat,		"fstatat64"	}, /* 293 */
+	{ 4,	TD|TF,	sys_newfstatat,		"fstatat64"	}, /* 293 */
 	{ 3,	TD|TF,	sys_unlinkat,		"unlinkat"	}, /* 294 */
 	{ 4,	TD|TF,	sys_renameat,		"renameat"	}, /* 295 */
 	{ 5,	TD|TF,	sys_linkat,		"linkat"	}, /* 296 */
@ -332,108 +332,107 @@
 	{ 6,	TD,	sys_pselect6,		"pselect6"	}, /* 301 */
 	{ 5,	TD,	sys_ppoll,		"ppoll"		}, /* 302 */
 	{ 1,	TP,	sys_unshare,		"unshare"	}, /* 303 */
-	{ 2,	0,	printargs,		"set_robust_list" }, /* 304 */
-	{ 3,	0,	printargs,		"get_robust_list" }, /* 305 */
-	{ 6,	TD,	printargs,		"splice"	}, /* 306 */
-	{ 4,	TD,	printargs,		"sync_file_range" }, /* 307 */
-	{ 4,	TD,	printargs,		"tee"		}, /* 308 */
-	{ 4,	TD,	printargs,		"vmsplice"	}, /* 309 */
-
+	{ 2,	0,	sys_set_robust_list,	"set_robust_list" }, /* 304 */
+	{ 3,	0,	sys_get_robust_list,	"get_robust_list" }, /* 305 */
+	{ 6,	TD,	sys_splice,		"splice"	}, /* 306 */
+	{ 4,	TD,	sys_sync_file_range,	"sync_file_range" }, /* 307 */
+	{ 4,	TD,	sys_tee,		"tee"		}, /* 308 */
+	{ 4,	TD,	sys_vmsplice,		"vmsplice"	}, /* 309 */
 	{ 6,	0,	sys_move_pages,		"move_pages"	}, /* 310 */
 	{ 3,	0,	sys_getcpu,		"getcpu"	}, /* 311 */
-	{ 5,	TD,	sys_epoll_pwait,	"epoll_pwait"	}, /* 312 */
-	{ 5,	0,	printargs,		"SYS_313"	}, /* 313 */
-	{ 5,	0,	printargs,		"SYS_314"	}, /* 314 */
-	{ 5,	0,	printargs,		"SYS_315"	}, /* 315 */
+	{ 6,	TD,	sys_epoll_pwait,	"epoll_pwait"	}, /* 312 */
+	{ 2,	TF,	sys_utimes,		"utimes"	}, /* 313 */
+	{ 6,	TD,	sys_fallocate,		"fallocate"	}, /* 314 */
+	{ 4,	TD|TF,	sys_utimensat,		"utimensat"	}, /* 315 */
 	{ 3,	TD|TS,	sys_signalfd,		"signalfd"	}, /* 316 */
 	{ 4,	TD,	sys_timerfd,		"timerfd"	}, /* 317 */
 	{ 1,	TD,	sys_eventfd,		"eventfd"	}, /* 318 */
-	{ 5,	0,	printargs,		"SYS_319"	}, /* 319 */
-	{ 5,	0,	printargs,		"SYS_320"	}, /* 320 */
-	{ 5,	0,	printargs,		"SYS_321"	}, /* 321 */
-	{ 5,	0,	printargs,		"SYS_322"	}, /* 322 */
-	{ 5,	0,	printargs,		"SYS_323"	}, /* 323 */
-	{ 5,	0,	printargs,		"SYS_324"	}, /* 324 */
-	{ 5,	0,	printargs,		"SYS_325"	}, /* 325 */
-	{ 5,	0,	printargs,		"SYS_326"	}, /* 326 */
-	{ 5,	0,	printargs,		"SYS_327"	}, /* 327 */
-	{ 5,	0,	printargs,		"SYS_328"	}, /* 328 */
-	{ 5,	0,	printargs,		"SYS_329"	}, /* 329 */
-	{ 5,	0,	printargs,		"SYS_330"	}, /* 330 */
-	{ 5,	0,	printargs,		"SYS_331"	}, /* 331 */
-	{ 5,	0,	printargs,		"SYS_332"	}, /* 332 */
-	{ 5,	0,	printargs,		"SYS_333"	}, /* 333 */
-	{ 5,	0,	printargs,		"SYS_334"	}, /* 334 */
-	{ 5,	0,	printargs,		"SYS_335"	}, /* 335 */
-	{ 5,	0,	printargs,		"SYS_336"	}, /* 336 */
-	{ 5,	0,	printargs,		"SYS_337"	}, /* 337 */
-	{ 5,	0,	printargs,		"SYS_338"	}, /* 338 */
-	{ 5,	0,	printargs,		"SYS_339"	}, /* 339 */
-	{ 5,	0,	printargs,		"SYS_340"	}, /* 340 */
-	{ 5,	0,	printargs,		"SYS_341"	}, /* 341 */
-	{ 5,	0,	printargs,		"SYS_342"	}, /* 342 */
-	{ 5,	0,	printargs,		"SYS_343"	}, /* 343 */
-	{ 5,	0,	printargs,		"SYS_344"	}, /* 344 */
-	{ 5,	0,	printargs,		"SYS_345"	}, /* 345 */
-	{ 5,	0,	printargs,		"SYS_346"	}, /* 346 */
-	{ 5,	0,	printargs,		"SYS_347"	}, /* 347 */
-	{ 5,	0,	printargs,		"SYS_348"	}, /* 348 */
-	{ 5,	0,	printargs,		"SYS_349"	}, /* 349 */
-	{ 5,	0,	printargs,		"SYS_350"	}, /* 350 */
-	{ 5,	0,	printargs,		"SYS_351"	}, /* 351 */
-	{ 5,	0,	printargs,		"SYS_352"	}, /* 352 */
-	{ 5,	0,	printargs,		"SYS_353"	}, /* 353 */
-	{ 5,	0,	printargs,		"SYS_354"	}, /* 354 */
-	{ 5,	0,	printargs,		"SYS_355"	}, /* 355 */
-	{ 5,	0,	printargs,		"SYS_356"	}, /* 356 */
-	{ 5,	0,	printargs,		"SYS_357"	}, /* 357 */
-	{ 5,	0,	printargs,		"SYS_358"	}, /* 358 */
-	{ 5,	0,	printargs,		"SYS_359"	}, /* 359 */
-	{ 5,	0,	printargs,		"SYS_360"	}, /* 360 */
-	{ 5,	0,	printargs,		"SYS_361"	}, /* 361 */
-	{ 5,	0,	printargs,		"SYS_362"	}, /* 362 */
-	{ 5,	0,	printargs,		"SYS_363"	}, /* 363 */
-	{ 5,	0,	printargs,		"SYS_364"	}, /* 364 */
-	{ 5,	0,	printargs,		"SYS_365"	}, /* 365 */
-	{ 5,	0,	printargs,		"SYS_366"	}, /* 366 */
-	{ 5,	0,	printargs,		"SYS_367"	}, /* 367 */
-	{ 5,	0,	printargs,		"SYS_368"	}, /* 368 */
-	{ 5,	0,	printargs,		"SYS_369"	}, /* 369 */
-	{ 5,	0,	printargs,		"SYS_370"	}, /* 370 */
-	{ 5,	0,	printargs,		"SYS_371"	}, /* 371 */
-	{ 5,	0,	printargs,		"SYS_372"	}, /* 372 */
-	{ 5,	0,	printargs,		"SYS_373"	}, /* 373 */
-	{ 5,	0,	printargs,		"SYS_374"	}, /* 374 */
-	{ 5,	0,	printargs,		"SYS_375"	}, /* 375 */
-	{ 5,	0,	printargs,		"SYS_376"	}, /* 376 */
-	{ 5,	0,	printargs,		"SYS_377"	}, /* 377 */
-	{ 5,	0,	printargs,		"SYS_378"	}, /* 378 */
-	{ 5,	0,	printargs,		"SYS_379"	}, /* 379 */
-	{ 5,	0,	printargs,		"SYS_380"	}, /* 380 */
-	{ 5,	0,	printargs,		"SYS_381"	}, /* 381 */
-	{ 5,	0,	printargs,		"SYS_382"	}, /* 382 */
-	{ 5,	0,	printargs,		"SYS_383"	}, /* 383 */
-	{ 5,	0,	printargs,		"SYS_384"	}, /* 384 */
-	{ 5,	0,	printargs,		"SYS_385"	}, /* 385 */
-	{ 5,	0,	printargs,		"SYS_386"	}, /* 386 */
-	{ 5,	0,	printargs,		"SYS_387"	}, /* 387 */
-	{ 5,	0,	printargs,		"SYS_388"	}, /* 388 */
-	{ 5,	0,	printargs,		"SYS_389"	}, /* 389 */
-	{ 5,	0,	printargs,		"SYS_390"	}, /* 390 */
-	{ 5,	0,	printargs,		"SYS_391"	}, /* 391 */
-	{ 5,	0,	printargs,		"SYS_392"	}, /* 392 */
-	{ 5,	0,	printargs,		"SYS_393"	}, /* 393 */
-	{ 5,	0,	printargs,		"SYS_394"	}, /* 394 */
-	{ 5,	0,	printargs,		"SYS_395"	}, /* 395 */
-	{ 5,	0,	printargs,		"SYS_396"	}, /* 396 */
-	{ 5,	0,	printargs,		"SYS_397"	}, /* 397 */
-	{ 5,	0,	printargs,		"SYS_398"	}, /* 398 */
-	{ 5,	0,	printargs,		"SYS_399"	}, /* 399 */
+	{ 2,	TD,	sys_timerfd_create,	"timerfd_create"}, /* 319 */
+	{ 4,	TD,	sys_timerfd_settime,	"timerfd_settime"}, /* 320 */
+	{ 2,	TD,	sys_timerfd_gettime,	"timerfd_gettime"}, /* 321 */
+	{ 4,	TD|TS,	sys_signalfd4,		"signalfd4"	}, /* 322 */
+	{ 2,	TD,	sys_eventfd2,		"eventfd2"	}, /* 323 */
+	{ 1,	TD,	sys_inotify_init1,	"inotify_init1"	}, /* 324 */
+	{ 2,	TD,	sys_pipe2,		"pipe2"		}, /* 325 */
+	{ 3,	TD,	sys_dup3,		"dup3"		}, /* 326 */
+	{ 1,	TD,	sys_epoll_create1,	"epoll_create1"	}, /* 327 */
+	{ 5,	TD,	sys_preadv,		"preadv"	}, /* 328 */
+	{ 5,	TD,	sys_pwritev,		"pwritev"	}, /* 329 */
+	{ 4,	TP|TS,	sys_rt_tgsigqueueinfo,	"rt_tgsigqueueinfo"}, /* 330 */
+	{ 5,	TD,	sys_perf_event_open,	"perf_event_open"}, /* 331 */
+	{ 2,	TD,	sys_fanotify_init,	"fanotify_init"	}, /* 332 */
+	{ 5,	TD|TF,	sys_fanotify_mark,	"fanotify_mark"	}, /* 333 */
+	{ 4,	0,	sys_prlimit64,		"prlimit64"	}, /* 334 */
+	{ 5,	TD|TF,	sys_name_to_handle_at,	"name_to_handle_at"}, /* 335 */
+	{ 3,	TD,	sys_open_by_handle_at,	"open_by_handle_at"}, /* 336 */
+	{ 2,	0,	sys_clock_adjtime,	"clock_adjtime"	}, /* 337 */
+	{ 1,	TD,	sys_syncfs,		"syncfs"	}, /* 338 */
+	{ 2,	TD,	sys_setns,		"setns"		}, /* 339 */
+	{ 6,	0,	sys_process_vm_readv,	"process_vm_readv"	}, /* 340 */
+	{ 6,	0,	sys_process_vm_writev,	"process_vm_writev"	}, /* 341 */
+	{ 5,	0,	NULL,			NULL		}, /* 342 */
+	{ 5,	0,	NULL,			NULL		}, /* 343 */
+	{ 5,	0,	NULL,			NULL		}, /* 344 */
+	{ 5,	0,	NULL,			NULL		}, /* 345 */
+	{ 5,	0,	NULL,			NULL		}, /* 346 */
+	{ 5,	0,	NULL,			NULL		}, /* 347 */
+	{ 5,	0,	NULL,			NULL		}, /* 348 */
+	{ 5,	0,	NULL,			NULL		}, /* 349 */
+	{ 5,	0,	NULL,			NULL		}, /* 350 */
+	{ 5,	0,	NULL,			NULL		}, /* 351 */
+	{ 5,	0,	NULL,			NULL		}, /* 352 */
+	{ 5,	0,	NULL,			NULL		}, /* 353 */
+	{ 5,	0,	NULL,			NULL		}, /* 354 */
+	{ 5,	0,	NULL,			NULL		}, /* 355 */
+	{ 5,	0,	NULL,			NULL		}, /* 356 */
+	{ 5,	0,	NULL,			NULL		}, /* 357 */
+	{ 5,	0,	NULL,			NULL		}, /* 358 */
+	{ 5,	0,	NULL,			NULL		}, /* 359 */
+	{ 5,	0,	NULL,			NULL		}, /* 360 */
+	{ 5,	0,	NULL,			NULL		}, /* 361 */
+	{ 5,	0,	NULL,			NULL		}, /* 362 */
+	{ 5,	0,	NULL,			NULL		}, /* 363 */
+	{ 5,	0,	NULL,			NULL		}, /* 364 */
+	{ 5,	0,	NULL,			NULL		}, /* 365 */
+	{ 5,	0,	NULL,			NULL		}, /* 366 */
+	{ 5,	0,	NULL,			NULL		}, /* 367 */
+	{ 5,	0,	NULL,			NULL		}, /* 368 */
+	{ 5,	0,	NULL,			NULL		}, /* 369 */
+	{ 5,	0,	NULL,			NULL		}, /* 370 */
+	{ 5,	0,	NULL,			NULL		}, /* 371 */
+	{ 5,	0,	NULL,			NULL		}, /* 372 */
+	{ 5,	0,	NULL,			NULL		}, /* 373 */
+	{ 5,	0,	NULL,			NULL		}, /* 374 */
+	{ 5,	0,	NULL,			NULL		}, /* 375 */
+	{ 5,	0,	NULL,			NULL		}, /* 376 */
+	{ 5,	0,	NULL,			NULL		}, /* 377 */
+	{ 5,	0,	NULL,			NULL		}, /* 378 */
+	{ 5,	0,	NULL,			NULL		}, /* 379 */
+	{ 5,	0,	NULL,			NULL		}, /* 380 */
+	{ 5,	0,	NULL,			NULL		}, /* 381 */
+	{ 5,	0,	NULL,			NULL		}, /* 382 */
+	{ 5,	0,	NULL,			NULL		}, /* 383 */
+	{ 5,	0,	NULL,			NULL		}, /* 384 */
+	{ 5,	0,	NULL,			NULL		}, /* 385 */
+	{ 5,	0,	NULL,			NULL		}, /* 386 */
+	{ 5,	0,	NULL,			NULL		}, /* 387 */
+	{ 5,	0,	NULL,			NULL		}, /* 388 */
+	{ 5,	0,	NULL,			NULL		}, /* 389 */
+	{ 5,	0,	NULL,			NULL		}, /* 390 */
+	{ 5,	0,	NULL,			NULL		}, /* 391 */
+	{ 5,	0,	NULL,			NULL		}, /* 392 */
+	{ 5,	0,	NULL,			NULL		}, /* 393 */
+	{ 5,	0,	NULL,			NULL		}, /* 394 */
+	{ 5,	0,	NULL,			NULL		}, /* 395 */
+	{ 5,	0,	NULL,			NULL		}, /* 396 */
+	{ 5,	0,	NULL,			NULL		}, /* 397 */
+	{ 5,	0,	NULL,			NULL		}, /* 398 */
+	{ 5,	0,	NULL,			NULL		}, /* 399 */

 #if SYS_socket_subcall != 400
 #error fix me
 #endif
-	{ 8,	0,	printargs,		"socket_subcall"}, /* 400 */
+	{ 6,	0,	printargs,		"socket_subcall"}, /* 400 */
 	{ 3,	TN,	sys_socket,		"socket"	}, /* 401 */
 	{ 3,	TN,	sys_bind,		"bind"		}, /* 402 */
 	{ 3,	TN,	sys_connect,		"connect"	}, /* 403 */
@ -449,35 +448,36 @@
 	{ 2,	TN,	sys_shutdown,		"shutdown"	}, /* 413 */
 	{ 5,	TN,	sys_setsockopt,		"setsockopt"	}, /* 414 */
 	{ 5,	TN,	sys_getsockopt,		"getsockopt"	}, /* 415 */
-	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 416 */
+	{ 3,	TN,	sys_sendmsg,		"sendmsg"	}, /* 416 */
 	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 417 */
 	{ 4,	TN,	sys_accept4,		"accept4"	}, /* 418 */
+	{ 5,	TN,	sys_recvmmsg,		"recvmmsg"	}, /* 419 */

-#if SYS_ipc_subcall != 419
+#if SYS_ipc_subcall != 420
 #error fix me
 #endif
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 419 */
-	{ 4,	TI,	sys_semop,		"semop"		}, /* 420 */
-	{ 4,	TI,	sys_semget,		"semget"	}, /* 421 */
-	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 422 */
-	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 423 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 424 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 420 */
+	{ 4,	TI,	sys_semop,		"semop"		}, /* 421 */
+	{ 4,	TI,	sys_semget,		"semget"	}, /* 422 */
+	{ 4,	TI,	sys_semctl,		"semctl"	}, /* 423 */
+	{ 5,	TI,	sys_semtimedop,		"semtimedop"	}, /* 424 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 425 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 426 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 427 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 428 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 429 */
-	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 430 */
-	{ 4,	TI,	sys_msgrcv,		"msgrcv"	}, /* 431 */
-	{ 4,	TI,	sys_msgget,		"msgget"	}, /* 432 */
-	{ 4,	TI,	sys_msgctl,		"msgctl"	}, /* 433 */
-	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 434 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 430 */
+	{ 4,	TI,	sys_msgsnd,		"msgsnd"	}, /* 431 */
+	{ 4,	TI,	sys_msgrcv,		"msgrcv"	}, /* 432 */
+	{ 4,	TI,	sys_msgget,		"msgget"	}, /* 433 */
+	{ 4,	TI,	sys_msgctl,		"msgctl"	}, /* 434 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 435 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 436 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 437 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 438 */
 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 439 */
-	{ 4,	TI,	sys_shmat,		"shmat"		}, /* 440 */
-	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 441 */
-	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 442 */
-	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 443 */
+	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 440 */
+	{ 4,	TI,	sys_shmat,		"shmat"		}, /* 441 */
+	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 442 */
+	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 443 */
+	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 444 */
--- a/linux/s390x/ioctlent.h
+++ b/linux/s390x/ioctlent.h
@ -1,941 +0,0 @@
-{"linux/fs.h", "FIBMAP", 0x1},
-{"linux/fs.h", "FIGETBSZ", 0x2},
-{"linux/fd.h", "FDCLRPRM", 0x241},
-{"linux/fd.h", "FDMSGON", 0x245},
-{"linux/fd.h", "FDMSGOFF", 0x246},
-{"linux/fd.h", "FDFMTBEG", 0x247},
-{"linux/fd.h", "FDFMTEND", 0x249},
-{"linux/fd.h", "FDSETEMSGTRESH", 0x24a},
-{"linux/fd.h", "FDFLUSH", 0x24b},
-{"linux/fd.h", "FDRESET", 0x254},
-{"linux/fd.h", "FDWERRORCLR", 0x256},
-{"linux/fd.h", "FDRAWCMD", 0x258},
-{"linux/fd.h", "FDTWADDLE", 0x259},
-{"linux/fd.h", "FDEJECT", 0x25a},
-{"linux/hdreg.h", "HDIO_GETGEO", 0x301},
-{"linux/hdreg.h", "HDIO_GET_UNMASKINTR", 0x302},
-{"linux/hdreg.h", "HDIO_GET_MULTCOUNT", 0x304},
-{"linux/hdreg.h", "HDIO_OBSOLETE_IDENTITY", 0x307},
-{"linux/hdreg.h", "HDIO_GET_KEEPSETTINGS", 0x308},
-{"linux/hdreg.h", "HDIO_GET_32BIT", 0x309},
-{"linux/hdreg.h", "HDIO_GET_NOWERR", 0x30a},
-{"linux/hdreg.h", "HDIO_GET_DMA", 0x30b},
-{"linux/hdreg.h", "HDIO_GET_NICE", 0x30c},
-{"linux/hdreg.h", "HDIO_GET_IDENTITY", 0x30d},
-{"linux/hdreg.h", "HDIO_DRIVE_RESET", 0x31c},
-{"linux/hdreg.h", "HDIO_TRISTATE_HWIF", 0x31d},
-{"linux/hdreg.h", "HDIO_DRIVE_TASK", 0x31e},
-{"linux/hdreg.h", "HDIO_DRIVE_CMD", 0x31f},
-{"linux/hdreg.h", "HDIO_SET_MULTCOUNT", 0x321},
-{"linux/hdreg.h", "HDIO_SET_UNMASKINTR", 0x322},
-{"linux/hdreg.h", "HDIO_SET_KEEPSETTINGS", 0x323},
-{"linux/hdreg.h", "HDIO_SET_32BIT", 0x324},
-{"linux/hdreg.h", "HDIO_SET_NOWERR", 0x325},
-{"linux/hdreg.h", "HDIO_SET_DMA", 0x326},
-{"linux/hdreg.h", "HDIO_SET_PIO_MODE", 0x327},
-{"linux/hdreg.h", "HDIO_SCAN_HWIF", 0x328},
-{"linux/hdreg.h", "HDIO_SET_NICE", 0x329},
-{"linux/hdreg.h", "HDIO_UNREGISTER_HWIF", 0x32a},
-{"linux/hdreg.h", "HDIO_GETGEO_BIG", 0x330},
-{"linux/hdreg.h", "HDIO_GETGEO_BIG_RAW", 0x331},
-{"linux/umsdos_fs.h", "UMSDOS_READDIR_DOS", 0x4d2},
-{"linux/umsdos_fs.h", "UMSDOS_UNLINK_DOS", 0x4d3},
-{"linux/umsdos_fs.h", "UMSDOS_RMDIR_DOS", 0x4d4},
-{"linux/umsdos_fs.h", "UMSDOS_STAT_DOS", 0x4d5},
-{"linux/umsdos_fs.h", "UMSDOS_CREAT_EMD", 0x4d6},
-{"linux/umsdos_fs.h", "UMSDOS_UNLINK_EMD", 0x4d7},
-{"linux/umsdos_fs.h", "UMSDOS_READDIR_EMD", 0x4d8},
-{"linux/umsdos_fs.h", "UMSDOS_GETVERSION", 0x4d9},
-{"linux/umsdos_fs.h", "UMSDOS_INIT_EMD", 0x4da},
-{"linux/umsdos_fs.h", "UMSDOS_DOS_SETUP", 0x4db},
-{"linux/umsdos_fs.h", "UMSDOS_RENAME_DOS", 0x4dc},
-{"linux/lp.h", "LPCHAR", 0x601},
-{"linux/lp.h", "LPTIME", 0x602},
-{"linux/lp.h", "LPABORT", 0x604},
-{"linux/lp.h", "LPSETIRQ", 0x605},
-{"linux/ac97_codec.h", "AC97_RECMUX_MONO_MIX", 0x606},
-{"linux/lp.h", "LPGETIRQ", 0x606},
-{"linux/lp.h", "LPWAIT", 0x608},
-{"linux/lp.h", "LPCAREFUL", 0x609},
-{"linux/lp.h", "LPABORTOPEN", 0x60a},
-{"linux/lp.h", "LPGETSTATUS", 0x60b},
-{"linux/lp.h", "LPRESET", 0x60c},
-{"linux/lp.h", "LPGETSTATS", 0x60d},
-{"linux/lp.h", "LPGETFLAGS", 0x60e},
-{"linux/lp.h", "LPSETTIMEOUT", 0x60f},
-{"linux/fs.h", "BLKROSET", 0x125d},
-{"linux/fs.h", "BLKROGET", 0x125e},
-{"linux/fs.h", "BLKRRPART", 0x125f},
-{"linux/fs.h", "BLKGETSIZE", 0x1260},
-{"linux/fs.h", "BLKFLSBUF", 0x1261},
-{"linux/fs.h", "BLKRASET", 0x1262},
-{"linux/fs.h", "BLKRAGET", 0x1263},
-{"linux/fs.h", "BLKFRASET", 0x1264},
-{"linux/fs.h", "BLKFRAGET", 0x1265},
-{"linux/fs.h", "BLKSECTSET", 0x1266},
-{"linux/fs.h", "BLKSECTGET", 0x1267},
-{"linux/fs.h", "BLKSSZGET", 0x1268},
-{"linux/fs.h", "BLKPG", 0x1269},
-{"scsi/sg.h", "SG_SET_TIMEOUT", 0x2201},
-{"scsi/sg.h", "SG_GET_TIMEOUT", 0x2202},
-{"scsi/sg.h", "SG_EMULATED_HOST", 0x2203},
-{"scsi/sg.h", "SG_SET_TRANSFORM", 0x2204},
-{"scsi/sg.h", "SG_GET_TRANSFORM", 0x2205},
-{"scsi/sg.h", "SG_GET_COMMAND_Q", 0x2270},
-{"scsi/sg.h", "SG_SET_COMMAND_Q", 0x2271},
-{"scsi/sg.h", "SG_GET_RESERVED_SIZE", 0x2272},
-{"scsi/sg.h", "SG_SET_RESERVED_SIZE", 0x2275},
-{"scsi/sg.h", "SG_GET_SCSI_ID", 0x2276},
-{"scsi/sg.h", "SG_SET_FORCE_LOW_DMA", 0x2279},
-{"scsi/sg.h", "SG_GET_LOW_DMA", 0x227a},
-{"scsi/sg.h", "SG_SET_FORCE_PACK_ID", 0x227b},
-{"scsi/sg.h", "SG_GET_PACK_ID", 0x227c},
-{"scsi/sg.h", "SG_GET_NUM_WAITING", 0x227d},
-{"scsi/sg.h", "SG_SET_DEBUG", 0x227e},
-{"scsi/sg.h", "SG_GET_SG_TABLESIZE", 0x227f},
-{"scsi/sg.h", "SG_GET_VERSION_NUM", 0x2282},
-{"scsi/sg.h", "SG_NEXT_CMD_LEN", 0x2283},
-{"scsi/sg.h", "SG_SCSI_RESET", 0x2284},
-{"scsi/sg.h", "SG_IO", 0x2285},
-{"scsi/sg.h", "SG_GET_REQUEST_TABLE", 0x2286},
-{"scsi/sg.h", "SG_SET_KEEP_ORPHAN", 0x2287},
-{"scsi/sg.h", "SG_GET_KEEP_ORPHAN", 0x2288},
-{"linux/agpgart.h", "AGPIOC_ACQUIRE", 0x4101},
-{"linux/agpgart.h", "AGPIOC_RELEASE", 0x4102},
-{"linux/pmu.h", "PMU_IOC_SLEEP", 0x4200},
-{"asm/dasd.h", "BIODASDDISABLE", 0x4400},
-{"asm/dasd.h", "BIODASDENABLE", 0x4401},
-{"asm/dasd.h", "BIODASDRSRV", 0x4402},
-{"asm/dasd.h", "BIODASDRLSE", 0x4403},
-{"asm/dasd.h", "BIODASDSLCK", 0x4404},
-{"asm/dasd.h", "BIODASDPRRST", 0x4405},
-{"asm/dasd.h", "BIODASDQUIESCE", 0x4406},
-{"asm/dasd.h", "BIODASDRESUME", 0x4407},
-{"asm/cmb.h", "BIODASDCMFENABLE", 0x4420},
-{"asm/cmb.h", "BIODASDCMFDISABLE", 0x4421},
-{"asm/cmb.h", "BIODASDRESETCMB", 0x4422},
-{"linux/fb.h", "FBIOGET_VSCREENINFO", 0x4600},
-{"linux/fb.h", "FBIOPUT_VSCREENINFO", 0x4601},
-{"linux/ps2esdi.h", "CMD_READ", 0x4601},
-{"linux/fb.h", "FBIOGET_FSCREENINFO", 0x4602},
-{"linux/ps2esdi.h", "CMD_WRITE", 0x4602},
-{"linux/fb.h", "FBIOGETCMAP", 0x4604},
-{"linux/fb.h", "FBIOPUTCMAP", 0x4605},
-{"linux/fb.h", "FBIOPAN_DISPLAY", 0x4606},
-{"linux/fb.h", "FBIOGET_FCURSORINFO", 0x4607},
-{"linux/fb.h", "FBIOGET_VCURSORINFO", 0x4608},
-{"linux/fb.h", "FBIOPUT_VCURSORINFO", 0x4609},
-{"linux/fb.h", "FBIOGET_CURSORSTATE", 0x460a},
-{"linux/fb.h", "FBIOPUT_CURSORSTATE", 0x460b},
-{"linux/fb.h", "FBIOGET_CON2FBMAP", 0x460f},
-{"linux/fb.h", "FBIOPUT_CON2FBMAP", 0x4610},
-{"linux/fb.h", "FBIOBLANK", 0x4611},
-{"linux/fb.h", "FBIO_ALLOC", 0x4613},
-{"linux/fb.h", "FBIO_FREE", 0x4614},
-{"linux/fb.h", "FBIOGET_GLYPH", 0x4615},
-{"linux/fb.h", "FBIOGET_HWCINFO", 0x4616},
-{"linux/isdn.h", "IIOCNETAIF", 0x4901},
-{"linux/isdn.h", "IIOCNETDIF", 0x4902},
-{"linux/isdn.h", "IIOCNETSCF", 0x4903},
-{"linux/isdn.h", "IIOCNETGCF", 0x4904},
-{"linux/isdn.h", "IIOCNETANM", 0x4905},
-{"linux/isdn.h", "IIOCNETDNM", 0x4906},
-{"linux/isdn.h", "IIOCNETGNM", 0x4907},
-{"linux/isdn.h", "IIOCGETSET", 0x4908},
-{"linux/isdn.h", "IIOCSETSET", 0x4909},
-{"linux/isdn.h", "IIOCSETVER", 0x490a},
-{"linux/isdn.h", "IIOCNETHUP", 0x490b},
-{"linux/isdn.h", "IIOCSETGST", 0x490c},
-{"linux/isdn.h", "IIOCSETBRJ", 0x490d},
-{"linux/isdn.h", "IIOCSIGPRF", 0x490e},
-{"linux/isdn.h", "IIOCGETPRF", 0x490f},
-{"linux/isdn.h", "IIOCSETPRF", 0x4910},
-{"linux/isdn.h", "IIOCGETMAP", 0x4911},
-{"linux/isdn.h", "IIOCSETMAP", 0x4912},
-{"linux/isdn.h", "IIOCNETASL", 0x4913},
-{"linux/isdn.h", "IIOCNETDIL", 0x4914},
-{"linux/isdn.h", "IIOCGETCPS", 0x4915},
-{"linux/isdn.h", "IIOCGETDVR", 0x4916},
-{"linux/isdn.h", "IIOCNETLCR", 0x4917},
-{"linux/isdn.h", "IIOCNETDWRSET", 0x4918},
-{"linux/isdn.h", "IIOCNETALN", 0x4920},
-{"linux/isdn.h", "IIOCNETDLN", 0x4921},
-{"linux/isdn.h", "IIOCNETGPN", 0x4922},
-{"linux/isdn.h", "IIOCDBGVAR", 0x497f},
-{"linux/isdn.h", "IIOCDRVCTL", 0x4980},
-{"linux/kd.h", "KIOCSOUND", 0x4b2f},
-{"linux/kd.h", "KDMKTONE", 0x4b30},
-{"linux/kd.h", "KDGETLED", 0x4b31},
-{"linux/kd.h", "KDSETLED", 0x4b32},
-{"linux/kd.h", "KDGKBTYPE", 0x4b33},
-{"linux/kd.h", "KDADDIO", 0x4b34},
-{"linux/kd.h", "KDDELIO", 0x4b35},
-{"linux/kd.h", "KDENABIO", 0x4b36},
-{"linux/kd.h", "KDDISABIO", 0x4b37},
-{"linux/kd.h", "KDSETMODE", 0x4b3a},
-{"linux/kd.h", "KDGETMODE", 0x4b3b},
-{"linux/kd.h", "KDMAPDISP", 0x4b3c},
-{"linux/kd.h", "KDUNMAPDISP", 0x4b3d},
-{"linux/kd.h", "GIO_SCRNMAP", 0x4b40},
-{"linux/kd.h", "PIO_SCRNMAP", 0x4b41},
-{"linux/kd.h", "KDGKBMODE", 0x4b44},
-{"linux/kd.h", "KDSKBMODE", 0x4b45},
-{"linux/kd.h", "KDGKBENT", 0x4b46},
-{"linux/kd.h", "KDSKBENT", 0x4b47},
-{"linux/kd.h", "KDGKBSENT", 0x4b48},
-{"linux/kd.h", "KDSKBSENT", 0x4b49},
-{"linux/kd.h", "KDGKBDIACR", 0x4b4a},
-{"linux/kd.h", "KDSKBDIACR", 0x4b4b},
-{"linux/kd.h", "KDGETKEYCODE", 0x4b4c},
-{"linux/kd.h", "KDSETKEYCODE", 0x4b4d},
-{"linux/kd.h", "KDSIGACCEPT", 0x4b4e},
-{"linux/kd.h", "KDGHWCLK", 0x4b50},
-{"linux/kd.h", "KDSHWCLK", 0x4b51},
-{"linux/kd.h", "KDKBDREP", 0x4b52},
-{"linux/kd.h", "GIO_FONT", 0x4b60},
-{"linux/kd.h", "PIO_FONT", 0x4b61},
-{"linux/kd.h", "KDGKBMETA", 0x4b62},
-{"linux/kd.h", "KDSKBMETA", 0x4b63},
-{"linux/kd.h", "KDGKBLED", 0x4b64},
-{"linux/kd.h", "KDSKBLED", 0x4b65},
-{"linux/kd.h", "GIO_UNIMAP", 0x4b66},
-{"linux/kd.h", "PIO_UNIMAP", 0x4b67},
-{"linux/kd.h", "PIO_UNIMAPCLR", 0x4b68},
-{"linux/kd.h", "GIO_UNISCRNMAP", 0x4b69},
-{"linux/kd.h", "PIO_UNISCRNMAP", 0x4b6a},
-{"linux/kd.h", "GIO_FONTX", 0x4b6b},
-{"linux/kd.h", "PIO_FONTX", 0x4b6c},
-{"linux/kd.h", "PIO_FONTRESET", 0x4b6d},
-{"linux/kd.h", "GIO_CMAP", 0x4b70},
-{"linux/kd.h", "PIO_CMAP", 0x4b71},
-{"linux/kd.h", "KDFONTOP", 0x4b72},
-{"linux/loop.h", "LOOP_SET_FD", 0x4c00},
-{"linux/loop.h", "LOOP_CLR_FD", 0x4c01},
-{"linux/loop.h", "LOOP_SET_STATUS", 0x4c02},
-{"linux/loop.h", "LOOP_GET_STATUS", 0x4c03},
-{"linux/random.h", "RNDZAPENTCNT", 0x5204},
-{"linux/random.h", "RNDCLEARPOOL", 0x5206},
-{"linux/cdrom.h", "CDROMPAUSE", 0x5301},
-{"linux/cdrom.h", "CDROMRESUME", 0x5302},
-{"linux/cdrom.h", "CDROMPLAYMSF", 0x5303},
-{"linux/cdrom.h", "CDROMPLAYTRKIND", 0x5304},
-{"linux/cdrom.h", "CDROMREADTOCHDR", 0x5305},
-{"linux/cdrom.h", "CDROMREADTOCENTRY", 0x5306},
-{"linux/cdrom.h", "CDROMSTOP", 0x5307},
-{"linux/cdrom.h", "CDROMSTART", 0x5308},
-{"linux/cdrom.h", "CDROMEJECT", 0x5309},
-{"linux/cdrom.h", "CDROMVOLCTRL", 0x530a},
-{"linux/cdrom.h", "CDROMSUBCHNL", 0x530b},
-{"linux/cdrom.h", "CDROMREADMODE2", 0x530c},
-{"linux/cdrom.h", "CDROMREADMODE1", 0x530d},
-{"linux/cdrom.h", "CDROMREADAUDIO", 0x530e},
-{"linux/cdrom.h", "CDROMEJECT_SW", 0x530f},
-{"linux/cdrom.h", "CDROMMULTISESSION", 0x5310},
-{"linux/cdrom.h", "CDROM_GET_MCN", 0x5311},
-{"linux/cdrom.h", "CDROMRESET", 0x5312},
-{"linux/cdrom.h", "CDROMVOLREAD", 0x5313},
-{"linux/cdrom.h", "CDROMREADRAW", 0x5314},
-{"linux/cdrom.h", "CDROMREADCOOKED", 0x5315},
-{"linux/cdrom.h", "CDROMSEEK", 0x5316},
-{"linux/cdrom.h", "CDROMPLAYBLK", 0x5317},
-{"linux/cdrom.h", "CDROMREADALL", 0x5318},
-{"linux/cdrom.h", "CDROMCLOSETRAY", 0x5319},
-{"linux/cdrom.h", "CDROMGETSPINDOWN", 0x531d},
-{"linux/cdrom.h", "CDROMSETSPINDOWN", 0x531e},
-{"linux/cdrom.h", "CDROM_SET_OPTIONS", 0x5320},
-{"linux/cdrom.h", "CDROM_CLEAR_OPTIONS", 0x5321},
-{"linux/cdrom.h", "CDROM_SELECT_SPEED", 0x5322},
-{"linux/cdrom.h", "CDROM_SELECT_DISC", 0x5323},
-{"linux/cdrom.h", "CDROM_MEDIA_CHANGED", 0x5325},
-{"linux/cdrom.h", "CDROM_DRIVE_STATUS", 0x5326},
-{"linux/cdrom.h", "CDROM_DISC_STATUS", 0x5327},
-{"linux/cdrom.h", "CDROM_CHANGER_NSLOTS", 0x5328},
-{"linux/cdrom.h", "CDROM_LOCKDOOR", 0x5329},
-{"linux/cdrom.h", "CDROM_DEBUG", 0x5330},
-{"linux/cdrom.h", "CDROM_GET_CAPABILITY", 0x5331},
-{"scsi/scsi_ioctl.h", "SCSI_IOCTL_DOORLOCK", 0x5380},
-{"scsi/scsi_ioctl.h", "SCSI_IOCTL_DOORUNLOCK", 0x5381},
-{"scsi/scsi.h", "SCSI_IOCTL_GET_IDLUN", 0x5382},
-{"scsi/scsi.h", "SCSI_IOCTL_TAGGED_ENABLE", 0x5383},
-{"scsi/scsi.h", "SCSI_IOCTL_TAGGED_DISABLE", 0x5384},
-{"scsi/scsi.h", "SCSI_IOCTL_PROBE_HOST", 0x5385},
-{"scsi/scsi.h", "SCSI_IOCTL_GET_BUS_NUMBER", 0x5386},
-{"linux/cdrom.h", "DVD_READ_STRUCT", 0x5390},
-{"linux/cdrom.h", "DVD_WRITE_STRUCT", 0x5391},
-{"linux/cdrom.h", "DVD_AUTH", 0x5392},
-{"linux/cdrom.h", "CDROM_SEND_PACKET", 0x5393},
-{"linux/cdrom.h", "CDROM_NEXT_WRITABLE", 0x5394},
-{"linux/cdrom.h", "CDROM_LAST_WRITTEN", 0x5395},
-{"asm/ioctls.h", "TCGETS", 0x5401},
-{"asm/ioctls.h", "TCSETS", 0x5402},
-{"asm/ioctls.h", "TCSETSW", 0x5403},
-{"asm/ioctls.h", "TCSETSF", 0x5404},
-{"asm/ioctls.h", "TCGETA", 0x5405},
-{"asm/ioctls.h", "TCSETA", 0x5406},
-{"asm/ioctls.h", "TCSETAW", 0x5407},
-{"asm/ioctls.h", "TCSETAF", 0x5408},
-{"asm/ioctls.h", "TCSBRK", 0x5409},
-{"asm/ioctls.h", "TCXONC", 0x540a},
-{"asm/ioctls.h", "TCFLSH", 0x540b},
-{"asm/ioctls.h", "TIOCEXCL", 0x540c},
-{"asm/ioctls.h", "TIOCNXCL", 0x540d},
-{"asm/ioctls.h", "TIOCSCTTY", 0x540e},
-{"asm/ioctls.h", "TIOCGPGRP", 0x540f},
-{"asm/ioctls.h", "TIOCSPGRP", 0x5410},
-{"asm/ioctls.h", "TIOCOUTQ", 0x5411},
-{"asm/ioctls.h", "TIOCSTI", 0x5412},
-{"asm/ioctls.h", "TIOCGWINSZ", 0x5413},
-{"asm/ioctls.h", "TIOCSWINSZ", 0x5414},
-{"asm/ioctls.h", "TIOCMGET", 0x5415},
-{"asm/ioctls.h", "TIOCMBIS", 0x5416},
-{"asm/ioctls.h", "TIOCMBIC", 0x5417},
-{"asm/ioctls.h", "TIOCMSET", 0x5418},
-{"asm/ioctls.h", "TIOCGSOFTCAR", 0x5419},
-{"asm/ioctls.h", "TIOCSSOFTCAR", 0x541a},
-{"asm/ioctls.h", "FIONREAD", 0x541b},
-{"asm/ioctls.h", "TIOCLINUX", 0x541c},
-{"asm/ioctls.h", "TIOCCONS", 0x541d},
-{"asm/ioctls.h", "TIOCGSERIAL", 0x541e},
-{"asm/ioctls.h", "TIOCSSERIAL", 0x541f},
-{"asm/ioctls.h", "TIOCPKT", 0x5420},
-{"asm/ioctls.h", "FIONBIO", 0x5421},
-{"asm/ioctls.h", "TIOCNOTTY", 0x5422},
-{"asm/ioctls.h", "TIOCSETD", 0x5423},
-{"asm/ioctls.h", "TIOCGETD", 0x5424},
-{"asm/ioctls.h", "TCSBRKP", 0x5425},
-{"asm/ioctls.h", "TIOCTTYGSTRUCT", 0x5426},
-{"asm/ioctls.h", "TIOCSBRK", 0x5427},
-{"asm/ioctls.h", "TIOCCBRK", 0x5428},
-{"asm/ioctls.h", "TIOCGSID", 0x5429},
-{"asm/ioctls.h", "FIONCLEX", 0x5450},
-{"asm/ioctls.h", "FIOCLEX", 0x5451},
-{"asm/ioctls.h", "FIOASYNC", 0x5452},
-{"asm/ioctls.h", "TIOCSERCONFIG", 0x5453},
-{"asm/ioctls.h", "TIOCSERGWILD", 0x5454},
-{"asm/ioctls.h", "TIOCSERSWILD", 0x5455},
-{"asm/ioctls.h", "TIOCGLCKTRMIOS", 0x5456},
-{"asm/ioctls.h", "TIOCSLCKTRMIOS", 0x5457},
-{"asm/ioctls.h", "TIOCSERGSTRUCT", 0x5458},
-{"asm/ioctls.h", "TIOCSERGETLSR", 0x5459},
-{"asm/ioctls.h", "TIOCSERGETMULTI", 0x545a},
-{"asm/ioctls.h", "TIOCSERSETMULTI", 0x545b},
-{"asm/ioctls.h", "TIOCMIWAIT", 0x545c},
-{"asm/ioctls.h", "TIOCGICOUNT", 0x545d},
-{"asm/ioctls.h", "FIOQSIZE", 0x545e},
-{"linux/usbdevice_fs.h", "USBDEVFS_DISCARDURB", 0x550b},
-{"linux/usbdevice_fs.h", "USBDEVFS_RESET", 0x5514},
-{"linux/vt.h", "VT_OPENQRY", 0x5600},
-{"linux/vt.h", "VT_GETMODE", 0x5601},
-{"linux/vt.h", "VT_SETMODE", 0x5602},
-{"linux/vt.h", "VT_GETSTATE", 0x5603},
-{"linux/vt.h", "VT_SENDSIG", 0x5604},
-{"linux/vt.h", "VT_RELDISP", 0x5605},
-{"linux/vt.h", "VT_ACTIVATE", 0x5606},
-{"linux/vt.h", "VT_WAITACTIVE", 0x5607},
-{"linux/vt.h", "VT_DISALLOCATE", 0x5608},
-{"linux/vt.h", "VT_RESIZE", 0x5609},
-{"linux/vt.h", "VT_RESIZEX", 0x560a},
-{"linux/vt.h", "VT_LOCKSWITCH", 0x560b},
-{"linux/vt.h", "VT_UNLOCKSWITCH", 0x560c},
-{"linux/sonet.h", "SONET_SETFRAMING", 0x6115},
-{"linux/atm_nicstar.h", "NS_ADJBUFLEV", 0x6163},
-{"linux/atm_tcp.h", "SIOCSIFATMTCP", 0x6180},
-{"linux/atm_tcp.h", "ATMTCP_CREATE", 0x618e},
-{"linux/atm_tcp.h", "ATMTCP_REMOVE", 0x618f},
-{"linux/atmlec.h", "ATMLEC_CTRL", 0x61d0},
-{"linux/atmlec.h", "ATMLEC_DATA", 0x61d1},
-{"linux/atmlec.h", "ATMLEC_MCAST", 0x61d2},
-{"linux/atmmpc.h", "ATMMPC_CTRL", 0x61d8},
-{"linux/atmmpc.h", "ATMMPC_DATA", 0x61d9},
-{"linux/atmclip.h", "SIOCMKCLIP", 0x61e0},
-{"linux/atmarp.h", "ATMARPD_CTRL", 0x61e1},
-{"linux/atmarp.h", "ATMARP_MKIP", 0x61e2},
-{"linux/atmarp.h", "ATMARP_SETENTRY", 0x61e3},
-{"linux/atmarp.h", "ATMARP_ENCAP", 0x61e5},
-{"linux/atmsvc.h", "ATMSIGD_CTRL", 0x61f0},
-{"linux/comstats.h", "COM_GETPORTSTATS", 0x631e},
-{"linux/comstats.h", "COM_CLRPORTSTATS", 0x631f},
-{"linux/comstats.h", "COM_GETBRDSTATS", 0x6320},
-{"linux/comstats.h", "COM_READPORT", 0x6328},
-{"linux/comstats.h", "COM_READBOARD", 0x6329},
-{"linux/comstats.h", "COM_READPANEL", 0x632a},
-{"linux/video_decoder.h", "DECODER_DUMP", 0x64c0},
-{"linux/synclink.h", "MGSL_IOCSTXIDLE", 0x6d02},
-{"linux/synclink.h", "MGSL_IOCGTXIDLE", 0x6d03},
-{"linux/synclink.h", "MGSL_IOCTXENABLE", 0x6d04},
-{"linux/synclink.h", "MGSL_IOCRXENABLE", 0x6d05},
-{"linux/synclink.h", "MGSL_IOCTXABORT", 0x6d06},
-{"linux/synclink.h", "MGSL_IOCGSTATS", 0x6d07},
-{"linux/synclink.h", "MGSL_IOCLOOPTXDONE", 0x6d09},
-{"linux/synclink.h", "MGSL_IOCCLRMODCOUNT", 0x6d0f},
-{"linux/ncp_fs.h", "NCP_IOC_CONN_LOGGED_IN", 0x6e03},
-{"linux/rtc.h", "RTC_AIE_ON", 0x7001},
-{"linux/rtc.h", "RTC_AIE_OFF", 0x7002},
-{"linux/rtc.h", "RTC_UIE_ON", 0x7003},
-{"linux/rtc.h", "RTC_UIE_OFF", 0x7004},
-{"linux/rtc.h", "RTC_PIE_ON", 0x7005},
-{"linux/rtc.h", "RTC_PIE_OFF", 0x7006},
-{"linux/rtc.h", "RTC_WIE_ON", 0x700f},
-{"linux/rtc.h", "RTC_WIE_OFF", 0x7010},
-{"linux/nvram.h", "NVRAM_INIT", 0x7040},
-{"linux/nvram.h", "NVRAM_SETCKS", 0x7041},
-{"linux/ppdev.h", "PPCLAIM", 0x708b},
-{"linux/ppdev.h", "PPRELEASE", 0x708c},
-{"linux/ppdev.h", "PPYIELD", 0x708d},
-{"linux/ppdev.h", "PPEXCL", 0x708f},
-{"linux/telephony.h", "PHONE_CAPABILITIES", 0x7180},
-{"linux/telephony.h", "PHONE_RING", 0x7183},
-{"linux/telephony.h", "PHONE_HOOKSTATE", 0x7184},
-{"linux/telephony.h", "PHONE_RING_START", 0x7187},
-{"linux/telephony.h", "PHONE_RING_STOP", 0x7188},
-{"linux/telephony.h", "PHONE_REC_START", 0x718a},
-{"linux/telephony.h", "PHONE_REC_STOP", 0x718b},
-{"linux/telephony.h", "PHONE_REC_LEVEL", 0x718f},
-{"linux/telephony.h", "PHONE_PLAY_START", 0x7191},
-{"linux/telephony.h", "PHONE_PLAY_STOP", 0x7192},
-{"linux/telephony.h", "PHONE_PLAY_LEVEL", 0x7195},
-{"linux/telephony.h", "PHONE_GET_TONE_ON_TIME", 0x719e},
-{"linux/telephony.h", "PHONE_GET_TONE_OFF_TIME", 0x719f},
-{"linux/telephony.h", "PHONE_GET_TONE_STATE", 0x71a0},
-{"linux/telephony.h", "PHONE_BUSY", 0x71a1},
-{"linux/telephony.h", "PHONE_RINGBACK", 0x71a2},
-{"linux/telephony.h", "PHONE_DIALTONE", 0x71a3},
-{"linux/telephony.h", "PHONE_CPT_STOP", 0x71a4},
-{"linux/telephony.h", "PHONE_PSTN_GET_STATE", 0x71a5},
-{"linux/telephony.h", "PHONE_PSTN_LINETEST", 0x71a8},
-{"linux/ixjuser.h", "IXJCTL_DSP_RESET", 0x71c0},
-{"linux/ixjuser.h", "IXJCTL_DSP_IDLE", 0x71c5},
-{"linux/ixjuser.h", "IXJCTL_TESTRAM", 0x71c6},
-{"linux/ixjuser.h", "IXJCTL_AEC_STOP", 0x71cc},
-{"linux/ixjuser.h", "IXJCTL_AEC_GET_LEVEL", 0x71cd},
-{"linux/ixjuser.h", "IXJCTL_PSTN_LINETEST", 0x71d3},
-{"linux/ixjuser.h", "IXJCTL_DRYBUFFER_CLEAR", 0x71e7},
-{"linux/cdk.h", "STL_BINTR", 0x7314},
-{"linux/cdk.h", "STL_BSTART", 0x7315},
-{"linux/cdk.h", "STL_BSTOP", 0x7316},
-{"linux/cdk.h", "STL_BRESET", 0x7317},
-{"linux/cdk.h", "STL_GETPFLAG", 0x7350},
-{"linux/cdk.h", "STL_SETPFLAG", 0x7351},
-{"linux/if_ppp.h", "PPPIOCDISCONN", 0x7439},
-{"linux/if_ppp.h", "PPPIOCXFERUNIT", 0x744e},
-{"linux/jffs.h", "JFFS_PRINT_HASH", 0x745a},
-{"linux/jffs.h", "JFFS_PRINT_TREE", 0x745b},
-{"linux/jffs.h", "JFFS_GET_STATUS", 0x745c},
-{"asm/sockios.h", "FIOSETOWN", 0x8901},
-{"asm/sockios.h", "SIOCSPGRP", 0x8902},
-{"asm/sockios.h", "FIOGETOWN", 0x8903},
-{"asm/sockios.h", "SIOCGPGRP", 0x8904},
-{"asm/sockios.h", "SIOCATMARK", 0x8905},
-{"asm/sockios.h", "SIOCGSTAMP", 0x8906},
-{"linux/sockios.h", "SIOCADDRT", 0x890b},
-{"linux/sockios.h", "SIOCDELRT", 0x890c},
-{"linux/sockios.h", "SIOCRTMSG", 0x890d},
-{"linux/sockios.h", "SIOCGIFNAME", 0x8910},
-{"linux/sockios.h", "SIOCSIFLINK", 0x8911},
-{"linux/sockios.h", "SIOCGIFCONF", 0x8912},
-{"linux/sockios.h", "SIOCGIFFLAGS", 0x8913},
-{"linux/sockios.h", "SIOCSIFFLAGS", 0x8914},
-{"linux/sockios.h", "SIOCGIFADDR", 0x8915},
-{"linux/sockios.h", "SIOCSIFADDR", 0x8916},
-{"linux/sockios.h", "SIOCGIFDSTADDR", 0x8917},
-{"linux/sockios.h", "SIOCSIFDSTADDR", 0x8918},
-{"linux/sockios.h", "SIOCGIFBRDADDR", 0x8919},
-{"linux/sockios.h", "SIOCSIFBRDADDR", 0x891a},
-{"linux/sockios.h", "SIOCGIFNETMASK", 0x891b},
-{"linux/sockios.h", "SIOCSIFNETMASK", 0x891c},
-{"linux/sockios.h", "SIOCGIFMETRIC", 0x891d},
-{"linux/sockios.h", "SIOCSIFMETRIC", 0x891e},
-{"linux/sockios.h", "SIOCGIFMEM", 0x891f},
-{"linux/sockios.h", "SIOCSIFMEM", 0x8920},
-{"linux/sockios.h", "SIOCGIFMTU", 0x8921},
-{"linux/sockios.h", "SIOCSIFMTU", 0x8922},
-{"linux/sockios.h", "SIOCSIFNAME", 0x8923},
-{"linux/sockios.h", "SIOCSIFHWADDR", 0x8924},
-{"linux/sockios.h", "SIOCGIFENCAP", 0x8925},
-{"linux/sockios.h", "SIOCSIFENCAP", 0x8926},
-{"linux/sockios.h", "SIOCGIFHWADDR", 0x8927},
-{"linux/sockios.h", "SIOCGIFSLAVE", 0x8929},
-{"linux/sockios.h", "SIOCSIFSLAVE", 0x8930},
-{"linux/sockios.h", "SIOCADDMULTI", 0x8931},
-{"linux/sockios.h", "SIOCDELMULTI", 0x8932},
-{"linux/sockios.h", "SIOCGIFINDEX", 0x8933},
-{"linux/sockios.h", "SIOCSIFPFLAGS", 0x8934},
-{"linux/sockios.h", "SIOCGIFPFLAGS", 0x8935},
-{"linux/sockios.h", "SIOCDIFADDR", 0x8936},
-{"linux/sockios.h", "SIOCSIFHWBROADCAST", 0x8937},
-{"linux/sockios.h", "SIOCGIFCOUNT", 0x8938},
-{"linux/sockios.h", "SIOCGIFBR", 0x8940},
-{"linux/sockios.h", "SIOCSIFBR", 0x8941},
-{"linux/sockios.h", "SIOCGIFTXQLEN", 0x8942},
-{"linux/sockios.h", "SIOCSIFTXQLEN", 0x8943},
-{"linux/sockios.h", "SIOCDARP", 0x8953},
-{"linux/sockios.h", "SIOCGARP", 0x8954},
-{"linux/sockios.h", "SIOCSARP", 0x8955},
-{"linux/sockios.h", "SIOCDRARP", 0x8960},
-{"linux/sockios.h", "SIOCGRARP", 0x8961},
-{"linux/sockios.h", "SIOCSRARP", 0x8962},
-{"linux/sockios.h", "SIOCGIFMAP", 0x8970},
-{"linux/sockios.h", "SIOCSIFMAP", 0x8971},
-{"linux/sockios.h", "SIOCADDDLCI", 0x8980},
-{"linux/sockios.h", "SIOCDELDLCI", 0x8981},
-{"linux/sockios.h", "SIOCPROTOPRIVATE", 0x89e0},
-{"linux/sockios.h", "SIOCDEVPRIVATE", 0x89f0},
-{"linux/auto_fs.h", "AUTOFS_IOC_READY", 0x9360},
-{"linux/auto_fs.h", "AUTOFS_IOC_FAIL", 0x9361},
-{"linux/auto_fs.h", "AUTOFS_IOC_CATATONIC", 0x9362},
-{"linux/nbd.h", "NBD_SET_SOCK", 0xab00},
-{"linux/nbd.h", "NBD_SET_BLKSIZE", 0xab01},
-{"linux/nbd.h", "NBD_SET_SIZE", 0xab02},
-{"linux/nbd.h", "NBD_DO_IT", 0xab03},
-{"linux/nbd.h", "NBD_CLEAR_SOCK", 0xab04},
-{"linux/nbd.h", "NBD_CLEAR_QUE", 0xab05},
-{"linux/nbd.h", "NBD_PRINT_DEBUG", 0xab06},
-{"linux/nbd.h", "NBD_SET_SIZE_BLOCKS", 0xab07},
-{"linux/nbd.h", "NBD_DISCONNECT", 0xab08},
-{"linux/raw.h", "RAW_SETBIND", 0xac00},
-{"linux/raw.h", "RAW_GETBIND", 0xac01},
-{"linux/if_pppox.h", "PPPOEIOCDFWD", 0xb101},
-{"linux/lvm.h", "LV_ACTIVATE", 0xfe22},
-{"linux/lvm.h", "LV_DEACTIVATE", 0xfe23},
-{"linux/lvm.h", "LVM_RESET", 0xfe99},
-{"linux/lvm.h", "LVM_LOCK_LVM", 0xff00},
-{"linux/cyclades.h", "CYGETMON", 0x435901},
-{"linux/cyclades.h", "CYGETTHRESH", 0x435902},
-{"linux/cyclades.h", "CYSETTHRESH", 0x435903},
-{"linux/cyclades.h", "CYGETDEFTHRESH", 0x435904},
-{"linux/cyclades.h", "CYSETDEFTHRESH", 0x435905},
-{"linux/cyclades.h", "CYGETTIMEOUT", 0x435906},
-{"linux/cyclades.h", "CYSETTIMEOUT", 0x435907},
-{"linux/cyclades.h", "CYGETDEFTIMEOUT", 0x435908},
-{"linux/cyclades.h", "CYSETDEFTIMEOUT", 0x435909},
-{"linux/cyclades.h", "CYSETRFLOW", 0x43590a},
-{"linux/cyclades.h", "CYGETRFLOW", 0x43590b},
-{"linux/cyclades.h", "CYSETRTSDTR_INV", 0x43590c},
-{"linux/cyclades.h", "CYGETRTSDTR_INV", 0x43590d},
-{"linux/cyclades.h", "CYZSETPOLLCYCLE", 0x43590e},
-{"linux/cyclades.h", "CYZGETPOLLCYCLE", 0x43590f},
-{"linux/cyclades.h", "CYGETCD1400VER", 0x435910},
-{"linux/cyclades.h", "CYGETCARDINFO", 0x435911},
-{"linux/cyclades.h", "CYSETWAIT", 0x435912},
-{"linux/cyclades.h", "CYGETWAIT", 0x435913},
-{"linux/soundcard.h", "SOUND_MIXER_READ_VOLUME", 0x20044d00},
-{"linux/soundcard.h", "SOUND_MIXER_READ_BASS", 0x20044d01},
-{"linux/soundcard.h", "SOUND_MIXER_READ_TREBLE", 0x20044d02},
-{"linux/soundcard.h", "SOUND_MIXER_READ_SYNTH", 0x20044d03},
-{"linux/soundcard.h", "SOUND_MIXER_READ_PCM", 0x20044d04},
-{"linux/soundcard.h", "SOUND_MIXER_READ_SPEAKER", 0x20044d05},
-{"linux/soundcard.h", "SOUND_MIXER_READ_LINE", 0x20044d06},
-{"linux/soundcard.h", "SOUND_MIXER_READ_MIC", 0x20044d07},
-{"linux/soundcard.h", "SOUND_MIXER_READ_CD", 0x20044d08},
-{"linux/soundcard.h", "SOUND_MIXER_READ_IMIX", 0x20044d09},
-{"linux/soundcard.h", "SOUND_MIXER_READ_ALTPCM", 0x20044d0a},
-{"linux/soundcard.h", "SOUND_MIXER_READ_RECLEV", 0x20044d0b},
-{"linux/soundcard.h", "SOUND_MIXER_READ_IGAIN", 0x20044d0c},
-{"linux/soundcard.h", "SOUND_MIXER_READ_OGAIN", 0x20044d0d},
-{"linux/soundcard.h", "SOUND_MIXER_READ_LINE1", 0x20044d0e},
-{"linux/soundcard.h", "SOUND_MIXER_READ_LINE2", 0x20044d0f},
-{"linux/soundcard.h", "SOUND_MIXER_READ_LINE3", 0x20044d10},
-{"linux/soundcard.h", "SOUND_MIXER_READ_MUTE", 0x20044d1f},
-{"linux/soundcard.h", "SOUND_MIXER_READ_ENHANCE", 0x20044d1f},
-{"linux/soundcard.h", "SOUND_MIXER_READ_LOUD", 0x20044d1f},
-{"linux/soundcard.h", "SOUND_MIXER_READ_STEREODEVS", 0x20044dfb},
-{"linux/soundcard.h", "SOUND_MIXER_READ_CAPS", 0x20044dfc},
-{"linux/soundcard.h", "SOUND_MIXER_READ_RECMASK", 0x20044dfd},
-{"linux/soundcard.h", "SOUND_MIXER_READ_DEVMASK", 0x20044dfe},
-{"linux/soundcard.h", "SOUND_MIXER_READ_RECSRC", 0x20044dff},
-{"linux/ppdev.h", "PPWCONTROL", 0x40017084},
-{"linux/ppdev.h", "PPWDATA", 0x40017086},
-{"linux/ppdev.h", "PPWCTLONIRQ", 0x40017092},
-{"linux/telephony.h", "PHONE_MAXRINGS", 0x40017185},
-{"linux/telephony.h", "PHONE_PLAY_TONE", 0x4001719b},
-{"linux/ppdev.h", "PPFCONTROL", 0x4002708e},
-{"linux/telephony.h", "PHONE_RING_CADENCE", 0x40027186},
-{"linux/agpgart.h", "AGPIOC_DEALLOCATE", 0x40044107},
-{"linux/random.h", "RNDADDTOENTCNT", 0x40045201},
-{"asm/ioctls.h", "TIOCSPTLCK", 0x40045431},
-{"linux/atmdev.h", "ATM_SETSC", 0x400461f1},
-{"linux/devfs_fs.h", "DEVFSDIOC_SET_EVENT_MASK", 0x40046402},
-{"linux/devfs_fs.h", "DEVFSDIOC_RELEASE_EVENT_QUEUE", 0x40046403},
-{"linux/video_decoder.h", "DECODER_SET_NORM", 0x40046403},
-{"linux/devfs_fs.h", "DEVFSDIOC_SET_DEBUG_MASK", 0x40046404},
-{"linux/video_decoder.h", "DECODER_SET_INPUT", 0x40046404},
-{"linux/video_decoder.h", "DECODER_SET_OUTPUT", 0x40046405},
-{"linux/video_decoder.h", "DECODER_ENABLE_OUTPUT", 0x40046406},
-{"linux/video_encoder.h", "ENCODER_SET_NORM", 0x40046502},
-{"linux/video_encoder.h", "ENCODER_SET_INPUT", 0x40046503},
-{"linux/video_encoder.h", "ENCODER_SET_OUTPUT", 0x40046504},
-{"linux/video_encoder.h", "ENCODER_ENABLE_OUTPUT", 0x40046505},
-{"linux/ncp_fs.h", "NCP_IOC_GETMOUNTUID", 0x40046e02},
-{"linux/ncp_fs.h", "NCP_IOC_SET_SIGN_WANTED", 0x40046e06},
-{"linux/ncp_fs.h", "NCP_IOC_GETDENTRYTTL", 0x40046e0c},
-{"linux/ppdev.h", "PPSETMODE", 0x40047080},
-{"linux/ppdev.h", "PPDATADIR", 0x40047090},
-{"linux/ppdev.h", "PPNEGOT", 0x40047091},
-{"linux/ppdev.h", "PPSETPHASE", 0x40047094},
-{"linux/telephony.h", "PHONE_REC_CODEC", 0x40047189},
-{"linux/telephony.h", "PHONE_REC_DEPTH", 0x4004718c},
-{"linux/telephony.h", "PHONE_FRAME", 0x4004718d},
-{"linux/telephony.h", "PHONE_REC_VOLUME", 0x4004718e},
-{"linux/telephony.h", "PHONE_PLAY_CODEC", 0x40047190},
-{"linux/telephony.h", "PHONE_PLAY_DEPTH", 0x40047193},
-{"linux/telephony.h", "PHONE_PLAY_VOLUME", 0x40047194},
-{"linux/telephony.h", "PHONE_DTMF_OOB", 0x40047199},
-{"linux/telephony.h", "PHONE_SET_TONE_ON_TIME", 0x4004719c},
-{"linux/telephony.h", "PHONE_SET_TONE_OFF_TIME", 0x4004719d},
-{"linux/telephony.h", "PHONE_PSTN_SET_STATE", 0x400471a4},
-{"linux/telephony.h", "PHONE_WINK_DURATION", 0x400471a6},
-{"linux/ixjuser.h", "IXJCTL_GET_FILTER_HIST", 0x400471c8},
-{"linux/ixjuser.h", "IXJCTL_AEC_START", 0x400471cb},
-{"linux/ixjuser.h", "IXJCTL_SET_LED", 0x400471ce},
-{"linux/ixjuser.h", "IXJCTL_MIXER", 0x400471cf},
-{"linux/ixjuser.h", "IXJCTL_DAA_COEFF_SET", 0x400471d0},
-{"linux/ixjuser.h", "IXJCTL_PORT", 0x400471d1},
-{"linux/ixjuser.h", "IXJCTL_DAA_AGAIN", 0x400471d2},
-{"linux/ixjuser.h", "IXJCTL_POTS_PSTN", 0x400471d5},
-{"linux/ixjuser.h", "IXJCTL_HZ", 0x400471e0},
-{"linux/ixjuser.h", "IXJCTL_RATE", 0x400471e1},
-{"linux/ixjuser.h", "IXJCTL_INTERCOM_START", 0x400471fd},
-{"linux/ixjuser.h", "IXJCTL_INTERCOM_STOP", 0x400471fe},
-{"linux/if_ppp.h", "PPPIOCATTCHAN", 0x40047438},
-{"linux/if_ppp.h", "PPPIOCCONNECT", 0x4004743a},
-{"linux/if_ppp.h", "PPPIOCSMRRU", 0x4004743b},
-{"linux/if_ppp.h", "PPPIOCDETACH", 0x4004743c},
-{"linux/if_ppp.h", "PPPIOCATTACH", 0x4004743d},
-{"linux/if_ppp.h", "PPPIOCSDEBUG", 0x40047440},
-{"linux/if_ppp.h", "PPPIOCSMAXCID", 0x40047451},
-{"linux/if_ppp.h", "PPPIOCSMRU", 0x40047452},
-{"linux/if_ppp.h", "PPPIOCSRASYNCMAP", 0x40047454},
-{"linux/if_ppp.h", "PPPIOCSASYNCMAP", 0x40047457},
-{"linux/if_ppp.h", "PPPIOCSFLAGS", 0x40047459},
-{"linux/isdn_ppp.h", "PPPIOCBUNDLE", 0x40047481},
-{"linux/isdn_ppp.h", "PPPIOCSMPFLAGS", 0x40047483},
-{"linux/isdn_ppp.h", "PPPIOCSMPMTU", 0x40047484},
-{"linux/isdn_ppp.h", "PPPIOCSMPMRU", 0x40047485},
-{"linux/isdn_ppp.h", "PPPIOCSCOMPRESSOR", 0x40047487},
-{"linux/videodev.h", "VIDIOCCAPTURE", 0x40047608},
-{"linux/videodev.h", "VIDIOCSYNC", 0x40047612},
-{"linux/videodev.h", "VIDIOCSWRITEMODE", 0x40047619},
-{"linux/dn.h", "SIOCSNETADDR", 0x400489e0},
-{"linux/dn.h", "OSIOCSNETADDR", 0x400489e0},
-{"linux/auto_fs4.h", "AUTOFS_IOC_EXPIRE_MULTI", 0x40049366},
-{"linux/lvm.h", "VG_CREATE", 0x4004fe00},
-{"linux/lvm.h", "VG_REMOVE", 0x4004fe01},
-{"linux/lvm.h", "VG_EXTEND", 0x4004fe03},
-{"linux/lvm.h", "VG_REDUCE", 0x4004fe04},
-{"linux/lvm.h", "VG_SET_EXTENDABLE", 0x4004fe08},
-{"linux/lvm.h", "LV_CREATE", 0x4004fe20},
-{"linux/lvm.h", "LV_REMOVE", 0x4004fe21},
-{"linux/lvm.h", "LV_EXTEND", 0x4004fe24},
-{"linux/lvm.h", "LV_REDUCE", 0x4004fe25},
-{"linux/lvm.h", "LV_SET_ACCESS", 0x4004fe28},
-{"linux/lvm.h", "LV_SET_ALLOCATION", 0x4004fe29},
-{"linux/lvm.h", "LV_SET_STATUS", 0x4004fe2a},
-{"linux/lvm.h", "LE_REMAP", 0x4004fe2b},
-{"linux/lvm.h", "PV_FLUSH", 0x4004fe42},
-{"linux/lvm.h", "PE_LOCK_UNLOCK", 0x4004fe50},
-{"linux/elevator.h", "BLKELVSET", 0x4008126b},
-{"linux/fs.h", "BLKELVSET", 0x4008126b},
-{"linux/agpgart.h", "AGPIOC_SETUP", 0x40084103},
-{"linux/agpgart.h", "AGPIOC_RESERVE", 0x40084104},
-{"linux/agpgart.h", "AGPIOC_PROTECT", 0x40084105},
-{"linux/agpgart.h", "AGPIOC_BIND", 0x40084108},
-{"linux/agpgart.h", "AGPIOC_UNBIND", 0x40084109},
-{"linux/pmu.h", "PMU_IOC_SET_BACKLIGHT", 0x40084202},
-{"linux/input.h", "EVIOCSREP", 0x40084503},
-{"linux/input.h", "EVIOCSKEYCODE", 0x40084504},
-{"linux/random.h", "RNDADDENTROPY", 0x40085203},
-{"linux/usbdevice_fs.h", "USBDEVFS_REAPURB", 0x4008550c},
-{"linux/usbdevice_fs.h", "USBDEVFS_REAPURBNDELAY", 0x4008550d},
-{"linux/usbdevice_fs.h", "USBDEVFS_CONNECTINFO", 0x40085511},
-{"linux/ext2_fs.h", "EXT2_IOC_SETFLAGS", 0x40086602},
-{"linux/mtio.h", "MTIOCTOP", 0x40086d01},
-{"linux/ncp_fs.h", "NCP_IOC_GETMOUNTUID2", 0x40086e02},
-{"linux/matroxfb.h", "MATROXFB_SET_OUTPUT_CONNECTION", 0x40086ef8},
-{"linux/matroxfb.h", "MATROXFB_SET_OUTPUT_MODE", 0x40086efa},
-{"linux/rtc.h", "RTC_IRQP_SET", 0x4008700c},
-{"linux/rtc.h", "RTC_EPOCH_SET", 0x4008700e},
-{"linux/serio.h", "SPIOCSTYPE", 0x40087101},
-{"linux/telephony.h", "PHONE_CAPABILITIES_CHECK", 0x40087182},
-{"linux/ixjuser.h", "IXJCTL_SET_FILTER", 0x400871c7},
-{"linux/ixjuser.h", "IXJCTL_INIT_TONE", 0x400871c9},
-{"linux/ixjuser.h", "IXJCTL_TONE_CADENCE", 0x400871ca},
-{"linux/if_ppp.h", "PPPIOCSNPMODE", 0x4008744b},
-{"linux/ext2_fs.h", "EXT2_IOC_SETVERSION", 0x40087602},
-{"linux/videodev.h", "VIDIOCSFREQ", 0x4008760f},
-{"linux/if_pppox.h", "PPPOEIOCSFWD", 0x4008b100},
-{"linux/fd.h", "FDFMTTRK", 0x400c0248},
-{"linux/capi.h", "CAPI_REGISTER", 0x400c4301},
-{"linux/i2o-dev.h", "I2OEVTREG", 0x400c690a},
-{"linux/ncp_fs.h", "NCP_IOC_GETROOT", 0x400c6e08},
-{"linux/videodev.h", "VIDIOCSPLAYMODE", 0x400c7618},
-{"linux/video_decoder.h", "DECODER_SET_PICTURE", 0x400e6407},
-{"linux/videodev.h", "VIDIOCSPICT", 0x400e7607},
-{"asm/dasd.h", "BIODASDFMT", 0x40104401},
-{"linux/atm_idt77105.h", "IDT77105_GETSTAT", 0x40106132},
-{"linux/atm_idt77105.h", "IDT77105_GETSTATZ", 0x40106133},
-{"linux/atmdev.h", "ATM_GETSTAT", 0x40106150},
-{"linux/atmdev.h", "ATM_GETSTATZ", 0x40106151},
-{"linux/atmdev.h", "ATM_GETLOOP", 0x40106152},
-{"linux/atmdev.h", "ATM_SETLOOP", 0x40106153},
-{"linux/atmdev.h", "ATM_QUERYLOOP", 0x40106154},
-{"linux/atm_eni.h", "ENI_MEMDUMP", 0x40106160},
-{"linux/atm_zatm.h", "ZATM_GETPOOL", 0x40106161},
-{"linux/atm_nicstar.h", "NS_SETBUFLEV", 0x40106162},
-{"linux/atm_zatm.h", "ZATM_GETPOOLZ", 0x40106162},
-{"linux/atm_zatm.h", "ZATM_SETPOOL", 0x40106163},
-{"linux/atm_zatm.h", "ZATM_GETTHIST", 0x40106164},
-{"linux/atm_eni.h", "ENI_SETMULT", 0x40106167},
-{"linux/atmdev.h", "ATM_GETLINKRATE", 0x40106181},
-{"linux/atmdev.h", "ATM_GETNAMES", 0x40106183},
-{"linux/atmdev.h", "ATM_GETTYPE", 0x40106184},
-{"linux/atmdev.h", "ATM_GETESI", 0x40106185},
-{"linux/atmdev.h", "ATM_GETADDR", 0x40106186},
-{"linux/atmdev.h", "ATM_RSTADDR", 0x40106187},
-{"linux/atmdev.h", "ATM_ADDADDR", 0x40106188},
-{"linux/atmdev.h", "ATM_DELADDR", 0x40106189},
-{"linux/atmdev.h", "ATM_GETCIRANGE", 0x4010618a},
-{"linux/atmdev.h", "ATM_SETCIRANGE", 0x4010618b},
-{"linux/atmdev.h", "ATM_SETESI", 0x4010618c},
-{"linux/atmdev.h", "ATM_SETESIF", 0x4010618d},
-{"linux/ppdev.h", "PPSETTIME", 0x40107096},
-{"linux/if_ppp.h", "PPPIOCSCOMPRESS", 0x4010744d},
-{"linux/videodev.h", "VIDIOCMCAPTURE", 0x40107613},
-{"asm/tape390.h", "TAPE390_DISPLAY", 0x40116401},
-{"linux/fd.h", "FDSETMAXERRS", 0x4014024c},
-{"linux/videodev.h", "VIDIOCSCAPTURE", 0x40147617},
-{"linux/videodev.h", "VIDIOCSFBUF", 0x4018760c},
-{"linux/fd.h", "FDSETPRM", 0x40200242},
-{"linux/fd.h", "FDDEFPRM", 0x40200243},
-{"asm/dasd.h", "BIODASDSATTR", 0x40204402},
-{"linux/if_ppp.h", "PPPIOCSXASYNCMAP", 0x4020744f},
-{"linux/videodev.h", "VIDIOCSMICROCODE", 0x4020761b},
-{"linux/videodev.h", "VIDIOCSVBIFMT", 0x4020761d},
-{"linux/joystick.h", "JSIOCSCORR", 0x40246a21},
-{"linux/rtc.h", "RTC_ALM_SET", 0x40247007},
-{"linux/rtc.h", "RTC_SET_TIME", 0x4024700a},
-{"linux/rtc.h", "RTC_WKALM_SET", 0x4028700f},
-{"linux/videodev.h", "VIDIOCSWIN", 0x4028760a},
-{"linux/videodev.h", "VIDIOCSAUDIO", 0x40287611},
-{"linux/smb_fs.h", "SMB_IOC_NEWCONN", 0x402c7502},
-{"linux/synclink.h", "MGSL_IOCSPARAMS", 0x40306d00},
-{"linux/videodev.h", "VIDIOCSCHAN", 0x40307603},
-{"linux/videodev.h", "VIDIOCSTUNER", 0x40407605},
-{"linux/fd.h", "FDSETDRVPRM", 0x40800290},
-{"linux/usbdevice_fs.h", "USBDEVFS_GETDRIVER", 0x41045508},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_VOLUME", 0x60044d00},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_BASS", 0x60044d01},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_TREBLE", 0x60044d02},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_SYNTH", 0x60044d03},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_PCM", 0x60044d04},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_SPEAKER", 0x60044d05},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_LINE", 0x60044d06},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_MIC", 0x60044d07},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_CD", 0x60044d08},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_IMIX", 0x60044d09},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_ALTPCM", 0x60044d0a},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_RECLEV", 0x60044d0b},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_IGAIN", 0x60044d0c},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_OGAIN", 0x60044d0d},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_LINE1", 0x60044d0e},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_LINE2", 0x60044d0f},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_LINE3", 0x60044d10},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_MUTE", 0x60044d1f},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_ENHANCE", 0x60044d1f},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_LOUD", 0x60044d1f},
-{"linux/soundcard.h", "SOUND_MIXER_WRITE_RECSRC", 0x60044dff},
-{"linux/joystick.h", "JSIOCGAXES", 0x80016a11},
-{"linux/joystick.h", "JSIOCGBUTTONS", 0x80016a12},
-{"linux/ppdev.h", "PPRSTATUS", 0x80017081},
-{"linux/ppdev.h", "PPRCONTROL", 0x80017083},
-{"linux/ppdev.h", "PPRDATA", 0x80017085},
-{"linux/capi.h", "CAPI_GET_ERRCODE", 0x80024321},
-{"linux/capi.h", "CAPI_INSTALLED", 0x80024322},
-{"linux/capi.h", "CAPI_GET_FLAGS", 0x80044323},
-{"linux/capi.h", "CAPI_SET_FLAGS", 0x80044324},
-{"linux/capi.h", "CAPI_CLR_FLAGS", 0x80044325},
-{"linux/capi.h", "CAPI_NCCI_OPENCOUNT", 0x80044326},
-{"linux/capi.h", "CAPI_NCCI_GETUNIT", 0x80044327},
-{"asm/dasd.h", "DASDAPIVER", 0x80044400},
-{"linux/input.h", "EVIOCGVERSION", 0x80044501},
-{"linux/random.h", "RNDGETENTCNT", 0x80045200},
-{"asm/ioctls.h", "TIOCGPTN", 0x80045430},
-{"linux/usbdevice_fs.h", "USBDEVFS_RESETEP", 0x80045503},
-{"linux/usbdevice_fs.h", "USBDEVFS_SETCONFIGURATION", 0x80045505},
-{"linux/usbdevice_fs.h", "USBDEVFS_CLAIMINTERFACE", 0x8004550f},
-{"linux/usbdevice_fs.h", "USBDEVFS_RELEASEINTERFACE", 0x80045510},
-{"linux/usbdevice_fs.h", "USBDEVFS_CLEAR_HALT", 0x80045515},
-{"linux/watchdog.h", "WDIOC_GETSTATUS", 0x80045701},
-{"linux/watchdog.h", "WDIOC_GETBOOTSTATUS", 0x80045702},
-{"linux/watchdog.h", "WDIOC_GETTEMP", 0x80045703},
-{"linux/watchdog.h", "WDIOC_SETOPTIONS", 0x80045704},
-{"linux/watchdog.h", "WDIOC_KEEPALIVE", 0x80045705},
-{"linux/sonet.h", "SONET_GETDIAG", 0x80046114},
-{"linux/sonet.h", "SONET_GETFRAMING", 0x80046116},
-{"linux/devfs_fs.h", "DEVFSDIOC_GET_PROTO_REV", 0x80046400},
-{"linux/video_decoder.h", "DECODER_GET_STATUS", 0x80046402},
-{"linux/i2o-dev.h", "I2OVALIDATE", 0x80046908},
-{"linux/joystick.h", "JSIOCGVERSION", 0x80046a01},
-{"linux/udf_fs_i.h", "UDF_GETEASIZE", 0x80046c40},
-{"linux/zftape.h", "MTIOC_ZFTAPE_GETBLKSZ", 0x80046d68},
-{"linux/ncp_fs.h", "NCP_IOC_SIGN_WANTED", 0x80046e06},
-{"linux/ncp_fs.h", "NCP_IOC_SETDENTRYTTL", 0x80046e0c},
-{"linux/ppdev.h", "PPCLRIRQ", 0x80047093},
-{"linux/telephony.h", "PHONE_DTMF_READY", 0x80047196},
-{"linux/telephony.h", "PHONE_GET_DTMF", 0x80047197},
-{"linux/telephony.h", "PHONE_GET_DTMF_ASCII", 0x80047198},
-{"linux/telephony.h", "PHONE_EXCEPTION", 0x8004719a},
-{"linux/ixjuser.h", "IXJCTL_CARDTYPE", 0x800471c1},
-{"linux/ixjuser.h", "IXJCTL_SERIAL", 0x800471c2},
-{"linux/ixjuser.h", "IXJCTL_DSP_TYPE", 0x800471c3},
-{"linux/ixjuser.h", "IXJCTL_DSP_VERSION", 0x800471c4},
-{"linux/if_ppp.h", "PPPIOCGCHAN", 0x80047437},
-{"linux/if_ppp.h", "PPPIOCGDEBUG", 0x80047441},
-{"linux/if_ppp.h", "PPPIOCGMRU", 0x80047453},
-{"linux/if_ppp.h", "PPPIOCGRASYNCMAP", 0x80047455},
-{"linux/if_ppp.h", "PPPIOCGUNIT", 0x80047456},
-{"linux/if_ppp.h", "PPPIOCGASYNCMAP", 0x80047458},
-{"linux/if_ppp.h", "PPPIOCGFLAGS", 0x8004745a},
-{"linux/isdn_ppp.h", "PPPIOCGMPFLAGS", 0x80047482},
-{"linux/smb_fs.h", "SMB_IOC_GETMOUNTUID", 0x80047501},
-{"linux/smb_fs.h", "SMB_IOC_GETMOUNTUID32", 0x80047503},
-{"linux/dn.h", "SIOCGNETADDR", 0x800489e1},
-{"linux/dn.h", "OSIOCGNETADDR", 0x800489e1},
-{"linux/auto_fs.h", "AUTOFS_IOC_PROTOVER", 0x80049363},
-{"linux/lvm.h", "LVM_GET_IOP_VERSION", 0x8004fe98},
-{"linux/sonet.h", "SONET_GETFRSENSE", 0x80066117},
-{"linux/elevator.h", "BLKELVGET", 0x8008126a},
-{"linux/fs.h", "BLKELVGET", 0x8008126a},
-{"linux/agpgart.h", "AGPIOC_INFO", 0x80084100},
-{"linux/pmu.h", "PMU_IOC_GET_BACKLIGHT", 0x80084201},
-{"linux/pmu.h", "PMU_IOC_GET_MODEL", 0x80084203},
-{"linux/pmu.h", "PMU_IOC_HAS_ADB", 0x80084204},
-{"linux/input.h", "EVIOCGID", 0x80084502},
-{"linux/input.h", "EVIOCGREP", 0x80084503},
-{"linux/input.h", "EVIOCGKEYCODE", 0x80084504},
-{"linux/input.h", "EVIOCGKEY", 0x80084505},
-{"linux/random.h", "RNDGETPOOL", 0x80085202},
-{"linux/usbdevice_fs.h", "USBDEVFS_SETINTERFACE", 0x80085504},
-{"linux/ext2_fs.h", "EXT2_IOC_GETFLAGS", 0x80086601},
-{"linux/udf_fs_i.h", "UDF_GETEABLOCK", 0x80086c41},
-{"linux/udf_fs_i.h", "UDF_GETVOLIDENT", 0x80086c42},
-{"linux/mtio.h", "MTIOCPOS", 0x80086d03},
-{"linux/matroxfb.h", "MATROXFB_GET_OUTPUT_CONNECTION", 0x80086ef8},
-{"linux/matroxfb.h", "MATROXFB_GET_AVAILABLE_OUTPUTS", 0x80086ef9},
-{"linux/matroxfb.h", "MATROXFB_GET_ALL_OUTPUTS", 0x80086efb},
-{"linux/rtc.h", "RTC_IRQP_READ", 0x8008700b},
-{"linux/rtc.h", "RTC_EPOCH_READ", 0x8008700d},
-{"linux/telephony.h", "PHONE_CAPABILITIES_LIST", 0x80087181},
-{"linux/ixjuser.h", "IXJCTL_CID", 0x800871d4},
-{"linux/ixjuser.h", "IXJCTL_FRAMES_READ", 0x800871e2},
-{"linux/ixjuser.h", "IXJCTL_FRAMES_WRITTEN", 0x800871e3},
-{"linux/ixjuser.h", "IXJCTL_READ_WAIT", 0x800871e4},
-{"linux/ixjuser.h", "IXJCTL_WRITE_WAIT", 0x800871e5},
-{"linux/ixjuser.h", "IXJCTL_DRYBUFFER_READ", 0x800871e6},
-{"linux/ext2_fs.h", "EXT2_IOC_GETVERSION", 0x80087601},
-{"linux/videodev.h", "VIDIOCGFREQ", 0x8008760e},
-{"linux/video_decoder.h", "DECODER_GET_CAPABILITIES", 0x800c6401},
-{"linux/video_encoder.h", "ENCODER_GET_CAPABILITIES", 0x800c6501},
-{"linux/ncp_fs.h", "NCP_IOC_SETROOT", 0x800c6e08},
-{"linux/videodev.h", "VIDIOCKEY", 0x800c760d},
-{"linux/videodev.h", "VIDIOCGPICT", 0x800e7606},
-{"linux/fd.h", "FDGETDRVTYP", 0x8010020f},
-{"linux/usbdevice_fs.h", "USBDEVFS_DISCSIGNAL", 0x8010550e},
-{"linux/mtio.h", "MTIOCGETSIZE", 0x80106d09},
-{"linux/ncp_fs.h", "NCP_IOC_NCPREQUEST", 0x80106e01},
-{"linux/ncp_fs.h", "NCP_IOC_SETPRIVATEDATA", 0x80106e0a},
-{"linux/ppdev.h", "PPGETTIME", 0x80107095},
-{"linux/if_ppp.h", "PPPIOCGIDLE", 0x8010743f},
-{"linux/isdn_ppp.h", "PPPIOCGIFNAME", 0x80107488},
-{"linux/fd.h", "FDGETMAXERRS", 0x8014020e},
-{"linux/mtio.h", "MTIOCVOLINFO", 0x80146d08},
-{"linux/ncp_fs.h", "NCP_IOC_LOCKUNLOCK", 0x80146e07},
-{"linux/videodev.h", "VIDIOCGUNIT", 0x80147615},
-{"linux/videodev.h", "VIDIOCGCAPTURE", 0x80147616},
-{"linux/ncp_fs.h", "NCP_IOC_SIGN_INIT", 0x80186e05},
-{"linux/ncp_fs.h", "NCP_IOC_SETOBJECTNAME", 0x80186e09},
-{"linux/videodev.h", "VIDIOCGFBUF", 0x8018760b},
-{"linux/fd.h", "FDGETPRM", 0x80200204},
-{"asm/dasd.h", "BIODASDGATTR", 0x80204405},
-{"linux/fb.h", "FBIOGET_VBLANK", 0x80204612},
-{"linux/if_ppp.h", "PPPIOCGXASYNCMAP", 0x80207450},
-{"linux/videodev.h", "VIDIOCGVBIFMT", 0x8020761c},
-{"linux/sonet.h", "SONET_GETSTAT", 0x80246110},
-{"linux/sonet.h", "SONET_GETSTATZ", 0x80246111},
-{"linux/joystick.h", "JSIOCGCORR", 0x80246a22},
-{"linux/rtc.h", "RTC_ALM_READ", 0x80247008},
-{"linux/rtc.h", "RTC_RD_TIME", 0x80247009},
-{"linux/fd.h", "FDGETFDCSTAT", 0x80280215},
-{"linux/fd.h", "FDWERRORGET", 0x80280217},
-{"linux/rtc.h", "RTC_WKALM_RD", 0x80287010},
-{"linux/videodev.h", "VIDIOCGWIN", 0x80287609},
-{"linux/videodev.h", "VIDIOCGAUDIO", 0x80287610},
-{"linux/ncp_fs.h", "NCP_IOC_SETCHARSETS", 0x802a6e0b},
-{"linux/synclink.h", "MGSL_IOCGPARAMS", 0x80306d01},
-{"linux/mtio.h", "MTIOCGET", 0x80306d02},
-{"linux/usbdevice_fs.h", "USBDEVFS_SUBMITURB", 0x8038550a},
-{"linux/videodev.h", "VIDIOCGCAP", 0x803c7601},
-{"linux/i2o-dev.h", "I2OGETIOPS", 0x80406900},
-{"linux/isdn_ppp.h", "PPPIOCGCOMPRESSORS", 0x80407486},
-{"linux/watchdog.h", "WDIOC_GETSUPPORT", 0x80485700},
-{"linux/fd.h", "FDGETDRVSTAT", 0x80500212},
-{"linux/fd.h", "FDPOLLDRVSTAT", 0x80500213},
-{"linux/i2o-dev.h", "I2OEVTGET", 0x8068690b},
-{"linux/fd.h", "FDGETDRVPRM", 0x80800211},
-{"linux/usbdevice_fs.h", "USBDEVFS_HUB_PORTINFO", 0x80805513},
-{"linux/videodev.h", "VIDIOCGMBUF", 0x80887614},
-{"asm/dasd.h", "BIODASDPSRD", 0x80c04404},
-{"linux/auto_fs.h", "AUTOFS_IOC_EXPIRE", 0x810c9365},
-{"linux/videodev.h", "VIDIOCGPLAYINFO", 0x8118761a},
-{"asm/dasd.h", "BIODASDINFO", 0x81784401},
-{"asm/dasd.h", "BIODASDINFO2", 0x81a04403},
-{"linux/msdos_fs.h", "VFAT_IOCTL_READDIR_BOTH", 0x82307201},
-{"linux/msdos_fs.h", "VFAT_IOCTL_READDIR_SHORT", 0x82307202},
-{"asm/dasd.h", "BIODASDPRRD", 0x84084402},
-{"linux/capi.h", "CAPI_GET_MANUFACTURER", 0xc0044306},
-{"linux/capi.h", "CAPI_GET_SERIAL", 0xc0044308},
-{"linux/sonet.h", "SONET_SETDIAG", 0xc0046112},
-{"linux/sonet.h", "SONET_CLRDIAG", 0xc0046113},
-{"linux/synclink.h", "MGSL_IOCWAITEVENT", 0xc0046d08},
-{"linux/if_ppp.h", "PPPIOCNEWUNIT", 0xc004743e},
-{"linux/lvm.h", "VG_STATUS", 0xc004fe05},
-{"linux/lvm.h", "VG_STATUS_GET_COUNT", 0xc004fe06},
-{"linux/lvm.h", "VG_STATUS_GET_NAMELIST", 0xc004fe07},
-{"linux/lvm.h", "LV_STATUS_BYNAME", 0xc004fe26},
-{"linux/lvm.h", "LV_STATUS_BYINDEX", 0xc004fe27},
-{"linux/lvm.h", "PV_STATUS", 0xc004fe40},
-{"linux/lvm.h", "PV_CHANGE", 0xc004fe41},
-{"linux/agpgart.h", "AGPIOC_ALLOCATE", 0xc0084106},
-{"asm/cmb.h", "BIODASDREADCMB", 0xc0084420},
-{"linux/coda.h", "CIOC_KERNEL_VERSION", 0xc008630a},
-{"linux/matroxfb.h", "MATROXFB_GET_OUTPUT_MODE", 0xc0086efa},
-{"linux/telephony.h", "PHONE_QUERY_CODEC", 0xc00871a7},
-{"linux/if_ppp.h", "PPPIOCGNPMODE", 0xc008744c},
-{"linux/auto_fs.h", "AUTOFS_IOC_SETTIMEOUT", 0xc0089364},
-{"linux/capi.h", "CAPI_GET_VERSION", 0xc0104307},
-{"linux/capi.h", "CAPI_MANUFACTURER_CMD", 0xc0104320},
-{"linux/usbdevice_fs.h", "USBDEVFS_IOCTL", 0xc0105512},
-{"linux/atm_nicstar.h", "NS_GETPSTAT", 0xc0106161},
-{"linux/ncp_fs.h", "NCP_IOC_GETPRIVATEDATA", 0xc0106e0a},
-{"linux/usbdevice_fs.h", "USBDEVFS_CONTROL", 0xc0185500},
-{"linux/usbdevice_fs.h", "USBDEVFS_BULK", 0xc0185502},
-{"linux/i2o-dev.h", "I2OHRTGET", 0xc0186901},
-{"linux/i2o-dev.h", "I2OLCTGET", 0xc0186902},
-{"linux/mtio.h", "MTIOCRDFTSEG", 0xc0186d06},
-{"linux/mtio.h", "MTIOCWRFTSEG", 0xc0186d07},
-{"linux/mtio.h", "MTIOCFTFORMAT", 0xc0186d0a},
-{"linux/ncp_fs.h", "NCP_IOC_GETOBJECTNAME", 0xc0186e09},
-{"linux/mtio.h", "MTIOCFTCMD", 0xc0206d0b},
-{"linux/i2o-dev.h", "I2OPARMSET", 0xc0286903},
-{"linux/i2o-dev.h", "I2OPARMGET", 0xc0286904},
-{"linux/ncp_fs.h", "NCP_IOC_GET_FS_INFO", 0xc0286e04},
-{"linux/ncp_fs.h", "NCP_IOC_GETCHARSETS", 0xc02a6e0b},
-{"linux/i2o-dev.h", "I2OSWDL", 0xc0306905},
-{"linux/i2o-dev.h", "I2OSWUL", 0xc0306906},
-{"linux/i2o-dev.h", "I2OSWDEL", 0xc0306907},
-{"linux/i2o-dev.h", "I2OHTML", 0xc0306909},
-{"linux/ncp_fs.h", "NCP_IOC_GET_FS_INFO_V2", 0xc0306e04},
-{"linux/videodev.h", "VIDIOCGCHAN", 0xc0307602},
-{"linux/capi.h", "CAPI_GET_PROFILE", 0xc0404309},
-{"linux/videodev.h", "VIDIOCGTUNER", 0xc0407604},
-{"asm/cmb.h", "BIODASDREADALLCMB", 0xc0584421},
-{"linux/isdn_ppp.h", "PPPIOCGCALLINFO", 0xc0887480},
--- a/Show More
+++ b/Show More