2004-07-12 Roland McGrath <roland@redhat.com>

	* linux/ioctlsort.c: Add some #includes.
	[POWERPC]: Kludge out high bits.
	* linux/ia64/ioctlent.h: Regenerated using RHEL3 headers.
	* linux/powerpc/ioctlent.h: Likewise.

diff --git a/linux/ia64/ioctlent.h b/linux/ia64/ioctlent.h
index c1d6b8a4247c3c14625960fa603feb03c4ae9a37..8cd2acdba5e5235c7540b3ecd52b7fd01fc41139 100644 (file)
--- a/linux/ia64/ioctlent.h
+++ b/linux/ia64/ioctlent.h
@@ -1,3 +1,4 @@
+       /* Generated by ioctlsort */
        {"linux/fs.h",  "FIBMAP",       0x1},
        {"linux/fs.h",  "FIGETBSZ",     0x2},
        {"linux/fd.h",  "FDGETPRM",     0x204},
@@ -25,17 +26,6 @@
        {"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},
@@ -50,13 +40,24 @@
        {"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",  "BLKGETLASTSECT",       0x126c},
+       {"linux/fs.h",  "BLKSETLASTSECT",       0x126d},
        {"linux/fs.h",  "BLKBSZGET",    0x1270},
        {"linux/fs.h",  "BLKBSZSET",    0x1271},
-       {"linux/fs.h",  "BLKGETSIZE64", 0x1272},
+       {"linux/audit.h",       "AUIOCATTACH",  0x4065},
+       {"linux/audit.h",       "AUIOCDETACH",  0x4066},
+       {"linux/audit.h",       "AUIOCSUSPEND", 0x4067},
+       {"linux/audit.h",       "AUIOCRESUME",  0x4068},
+       {"linux/audit.h",       "AUIOCCLRPOLICY",       0x4069},
+       {"linux/audit.h",       "AUIOCSETPOLICY",       0x406a},
+       {"linux/audit.h",       "AUIOCIAMAUDITD",       0x406b},
+       {"linux/audit.h",       "AUIOCSETAUDITID",      0x406c},
+       {"linux/audit.h",       "AUIOCLOGIN",   0x406e},
+       {"linux/audit.h",       "AUIOCUSERMESSAGE",     0x406f},
+       {"linux/audit.h",       "AUIOCCLRFILTER",       0x4070},
+       {"linux/audit.h",       "AUIOCSETFILTER",       0x4071},
        {"linux/agpgart.h",     "AGPIOC_INFO",  0x4100},
        {"linux/agpgart.h",     "AGPIOC_ACQUIRE",       0x4101},
        {"linux/apm_bios.h",    "APM_IOC_STANDBY",      0x4101},
@@ -121,7 +122,27 @@
        {"linux/input.h",       "EVIOCSGAIN",   0x4582},
        {"linux/input.h",       "EVIOCSAUTOCENTER",     0x4583},
        {"linux/input.h",       "EVIOCGEFFECTS",        0x4584},
+       {"linux/fb.h",  "FBIOGET_VSCREENINFO",  0x4600},
+       {"linux/fb.h",  "FBIOPUT_VSCREENINFO",  0x4601},
+       {"linux/fb.h",  "FBIOGET_FSCREENINFO",  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",  "FBIOGET_VBLANK",       0x4612},
+       {"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/fb.h",  "FBIOPUT_MODEINFO",     0x4617},
+       {"linux/fb.h",  "FBIOGET_DISPINFO",     0x4618},
        {"linux/hiddev.h",      "HIDIOCGVERSION",       0x4801},
        {"linux/hiddev.h",      "HIDIOCAPPLICATION",    0x4802},
        {"linux/hiddev.h",      "HIDIOCGDEVINFO",       0x4803},
@@ -163,6 +184,52 @@
        {"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/soundcard.h",   "SOUND_MIXER_INFO",     0x4d65},
        {"linux/soundcard.h",   "SOUND_OLD_MIXER_INFO", 0x4d65},
        {"linux/soundcard.h",   "SOUND_MIXER_ACCESS",   0x4d66},
@@ -186,8 +253,8 @@
        {"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",   "SOUND_PCM_WRITE_FILTER",       0x5007},
        {"linux/soundcard.h",   "SNDCTL_DSP_POST",      0x5008},
        {"linux/soundcard.h",   "SNDCTL_DSP_SUBDIVIDE", 0x5009},
        {"linux/soundcard.h",   "SNDCTL_DSP_SETFRAGMENT",       0x500a},
@@ -238,22 +305,67 @@
        {"linux/random.h",      "RNDADDENTROPY",        0x5203},
        {"linux/random.h",      "RNDZAPENTCNT", 0x5204},
        {"linux/random.h",      "RNDCLEARPOOL", 0x5206},
-       {"asm/ioctls.h",        "TCGETS",       0x5401},
+       {"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},
+       {"linux/cdrom.h",       "CDROMAUDIOBUFSIZ",     0x5382},
+       {"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},
        {"linux/soundcard.h",   "SNDCTL_TMR_TIMEBASE",  0x5401},
-       {"asm/ioctls.h",        "TCSETS",       0x5402},
+       {"asm/ioctls.h",        "TCGETS",       0x5401},
        {"linux/soundcard.h",   "SNDCTL_TMR_START",     0x5402},
-       {"asm/ioctls.h",        "TCSETSW",      0x5403},
+       {"asm/ioctls.h",        "TCSETS",       0x5402},
        {"linux/soundcard.h",   "SNDCTL_TMR_STOP",      0x5403},
-       {"asm/ioctls.h",        "TCSETSF",      0x5404},
+       {"asm/ioctls.h",        "TCSETSW",      0x5403},
        {"linux/soundcard.h",   "SNDCTL_TMR_CONTINUE",  0x5404},
-       {"asm/ioctls.h",        "TCGETA",       0x5405},
+       {"asm/ioctls.h",        "TCSETSF",      0x5404},
        {"linux/soundcard.h",   "SNDCTL_TMR_TEMPO",     0x5405},
-       {"asm/ioctls.h",        "TCSETA",       0x5406},
+       {"asm/ioctls.h",        "TCGETA",       0x5405},
        {"linux/soundcard.h",   "SNDCTL_TMR_SOURCE",    0x5406},
-       {"asm/ioctls.h",        "TCSETAW",      0x5407},
+       {"asm/ioctls.h",        "TCSETA",       0x5406},
        {"linux/soundcard.h",   "SNDCTL_TMR_METRONOME", 0x5407},
-       {"asm/ioctls.h",        "TCSETAF",      0x5408},
+       {"asm/ioctls.h",        "TCSETAW",      0x5407},
        {"linux/soundcard.h",   "SNDCTL_TMR_SELECT",    0x5408},
+       {"asm/ioctls.h",        "TCSETAF",      0x5408},
        {"asm/ioctls.h",        "TCSBRK",       0x5409},
        {"asm/ioctls.h",        "TCXONC",       0x540a},
        {"asm/ioctls.h",        "TCFLSH",       0x540b},
@@ -305,6 +417,7 @@
        {"asm/ioctls.h",        "TIOCGICOUNT",  0x545d},
        {"asm/ioctls.h",        "TIOCGHAYESESP",        0x545e},
        {"asm/ioctls.h",        "TIOCSHAYESESP",        0x545f},
+       {"asm/ioctls.h",        "FIOQSIZE",     0x5460},
        {"linux/if_tun.h",      "TUNSETNOCSUM", 0x54c8},
        {"linux/if_tun.h",      "TUNSETDEBUG",  0x54c9},
        {"linux/if_tun.h",      "TUNSETIFF",    0x54ca},
@@ -328,14 +441,25 @@
        {"linux/usbdevice_fs.h",        "USBDEVFS_HUB_PORTINFO",        0x5513},
        {"linux/usbdevice_fs.h",        "USBDEVFS_RESET",       0x5514},
        {"linux/usbdevice_fs.h",        "USBDEVFS_CLEAR_HALT",  0x5515},
+       {"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/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},
@@ -404,12 +528,12 @@
        {"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/devfs_fs.h",    "DEVFSDIOC_SET_EVENT_MASK",     0x6402},
        {"linux/video_decoder.h",       "DECODER_SET_NORM",     0x6403},
-       {"linux/devfs_fs.h",    "DEVFSDIOC_SET_DEBUG_MASK",     0x6404},
+       {"linux/devfs_fs.h",    "DEVFSDIOC_RELEASE_EVENT_QUEUE",        0x6403},
        {"linux/video_decoder.h",       "DECODER_SET_INPUT",    0x6404},
+       {"linux/devfs_fs.h",    "DEVFSDIOC_SET_DEBUG_MASK",     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},
@@ -438,14 +562,6 @@
        {"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},
@@ -459,28 +575,28 @@
        {"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/soundcard.h",   "SNDCTL_MIDI_PRETIME",  0x6d00},
+       {"linux/synclink.h",    "MGSL_IOCGPARAMS",      0x6d01},
        {"linux/mtio.h",        "MTIOCTOP",     0x6d01},
        {"linux/soundcard.h",   "SNDCTL_MIDI_MPUMODE",  0x6d01},
-       {"linux/synclink.h",    "MGSL_IOCGPARAMS",      0x6d01},
+       {"linux/synclink.h",    "MGSL_IOCSTXIDLE",      0x6d02},
        {"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/mtio.h",        "MTIOCPOS",     0x6d03},
        {"linux/synclink.h",    "MGSL_IOCTXENABLE",     0x6d04},
-       {"linux/mtio.h",        "MTIOCSETCONFIG",       0x6d05},
+       {"linux/mtio.h",        "MTIOCGETCONFIG",       0x6d04},
        {"linux/synclink.h",    "MGSL_IOCRXENABLE",     0x6d05},
-       {"linux/mtio.h",        "MTIOCRDFTSEG", 0x6d06},
+       {"linux/mtio.h",        "MTIOCSETCONFIG",       0x6d05},
        {"linux/synclink.h",    "MGSL_IOCTXABORT",      0x6d06},
-       {"linux/mtio.h",        "MTIOCWRFTSEG", 0x6d07},
+       {"linux/mtio.h",        "MTIOCRDFTSEG", 0x6d06},
        {"linux/synclink.h",    "MGSL_IOCGSTATS",       0x6d07},
-       {"linux/mtio.h",        "MTIOCVOLINFO", 0x6d08},
+       {"linux/mtio.h",        "MTIOCWRFTSEG", 0x6d07},
        {"linux/synclink.h",    "MGSL_IOCWAITEVENT",    0x6d08},
-       {"linux/mtio.h",        "MTIOCGETSIZE", 0x6d09},
+       {"linux/mtio.h",        "MTIOCVOLINFO", 0x6d08},
        {"linux/synclink.h",    "MGSL_IOCLOOPTXDONE",   0x6d09},
+       {"linux/mtio.h",        "MTIOCGETSIZE", 0x6d09},
        {"linux/mtio.h",        "MTIOCFTFORMAT",        0x6d0a},
        {"linux/mtio.h",        "MTIOCFTCMD",   0x6d0b},
        {"linux/synclink.h",    "MGSL_IOCCLRMODCOUNT",  0x6d0f},
@@ -492,8 +608,8 @@
        {"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_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},
@@ -505,11 +621,11 @@
        {"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_SET_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_SET_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},
@@ -549,8 +665,6 @@
        {"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},
@@ -588,6 +702,18 @@
        {"linux/ppdev.h",       "PPGETFLAGS",   0x709a},
        {"linux/ppdev.h",       "PPSETFLAGS",   0x709b},
        {"linux/serio.h",       "SPIOCSTYPE",   0x7101},
+       {"linux/videotext.h",   "VTXIOCGETINFO",        0x7101},
+       {"linux/videotext.h",   "VTXIOCCLRPAGE",        0x7102},
+       {"linux/videotext.h",   "VTXIOCCLRFOUND",       0x7103},
+       {"linux/videotext.h",   "VTXIOCPAGEREQ",        0x7104},
+       {"linux/videotext.h",   "VTXIOCGETSTAT",        0x7105},
+       {"linux/videotext.h",   "VTXIOCGETPAGE",        0x7106},
+       {"linux/videotext.h",   "VTXIOCSTOPDAU",        0x7107},
+       {"linux/videotext.h",   "VTXIOCPUTPAGE",        0x7108},
+       {"linux/videotext.h",   "VTXIOCSETDISP",        0x7109},
+       {"linux/videotext.h",   "VTXIOCPUTSTAT",        0x710a},
+       {"linux/videotext.h",   "VTXIOCCLRCACHE",       0x710b},
+       {"linux/videotext.h",   "VTXIOCSETVIRT",        0x710c},
        {"linux/telephony.h",   "PHONE_CAPABILITIES",   0x7180},
        {"linux/telephony.h",   "PHONE_CAPABILITIES_LIST",      0x7181},
        {"linux/telephony.h",   "PHONE_CAPABILITIES_CHECK",     0x7182},
@@ -677,8 +803,14 @@
        {"linux/ixjuser.h",     "IXJCTL_SC_TXG",        0x71eb},
        {"linux/ixjuser.h",     "IXJCTL_INTERCOM_START",        0x71fd},
        {"linux/ixjuser.h",     "IXJCTL_INTERCOM_STOP", 0x71fe},
+       {"linux/videotext.h",   "TUNIOCGETINFO",        0x7201},
        {"linux/msdos_fs.h",    "VFAT_IOCTL_READDIR_BOTH",      0x7201},
+       {"linux/videotext.h",   "TUNIOCRESET",  0x7202},
        {"linux/msdos_fs.h",    "VFAT_IOCTL_READDIR_SHORT",     0x7202},
+       {"linux/videotext.h",   "TUNIOCSETFREQ",        0x7203},
+       {"linux/videotext.h",   "TUNIOCGETFREQ",        0x7204},
+       {"linux/videotext.h",   "TUNIOCSETCHAN",        0x7205},
+       {"linux/videotext.h",   "TUNIOCGETCHAN",        0x7206},
        {"linux/cdk.h", "STL_BINTR",    0x7314},
        {"linux/cdk.h", "STL_BSTART",   0x7315},
        {"linux/cdk.h", "STL_BSTOP",    0x7316},
@@ -713,8 +845,8 @@
        {"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/if_ppp.h",      "PPPIOCGFLAGS", 0x745a},
        {"linux/jffs.h",        "JFFS_PRINT_TREE",      0x745b},
        {"linux/jffs.h",        "JFFS_GET_STATUS",      0x745c},
        {"linux/isdn_ppp.h",    "PPPIOCGCALLINFO",      0x7480},
@@ -737,20 +869,13 @@
        {"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},
@@ -778,10 +903,127 @@
        {"linux/meye.h",        "MEYEIOC_SYNC", 0x76c3},
        {"linux/meye.h",        "MEYEIOC_STILLCAPT",    0x76c4},
        {"linux/meye.h",        "MEYEIOC_STILLJCAPT",   0x76c5},
-       {"linux/dn.h",  "SIOCSNETADDR", 0x89e0},
+       {"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",     "SIOCGIFDIVERT",        0x8944},
+       {"linux/sockios.h",     "SIOCSIFDIVERT",        0x8945},
+       {"linux/sockios.h",     "SIOCETHTOOL",  0x8946},
+       {"linux/sockios.h",     "SIOCGMIIPHY",  0x8947},
+       {"linux/sockios.h",     "SIOCGMIIREG",  0x8948},
+       {"linux/sockios.h",     "SIOCSMIIREG",  0x8949},
+       {"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",     "SIOCGIFVLAN",  0x8982},
+       {"linux/sockios.h",     "SIOCSIFVLAN",  0x8983},
+       {"linux/sockios.h",     "SIOCBONDENSLAVE",      0x8990},
+       {"linux/sockios.h",     "SIOCBONDRELEASE",      0x8991},
+       {"linux/sockios.h",     "SIOCBONDSETHWADDR",    0x8992},
+       {"linux/sockios.h",     "SIOCBONDSLAVEINFOQUERY",       0x8993},
+       {"linux/sockios.h",     "SIOCBONDINFOQUERY",    0x8994},
+       {"linux/sockios.h",     "SIOCBONDCHANGEACTIVE", 0x8995},
        {"linux/dn.h",  "OSIOCSNETADDR",        0x89e0},
-       {"linux/dn.h",  "SIOCGNETADDR", 0x89e1},
+       {"linux/sockios.h",     "SIOCPROTOPRIVATE",     0x89e0},
+       {"linux/dn.h",  "SIOCSNETADDR", 0x89e0},
        {"linux/dn.h",  "OSIOCGNETADDR",        0x89e1},
+       {"linux/dn.h",  "SIOCGNETADDR", 0x89e1},
+       {"linux/sockios.h",     "SIOCDEVPRIVATE",       0x89f0},
+       {"linux/wireless.h",    "SIOCIWFIRST",  0x8b00},
+       {"linux/wireless.h",    "SIOCSIWCOMMIT",        0x8b00},
+       {"linux/wireless.h",    "SIOCGIWNAME",  0x8b01},
+       {"linux/wireless.h",    "SIOCSIWNWID",  0x8b02},
+       {"linux/wireless.h",    "SIOCGIWNWID",  0x8b03},
+       {"linux/wireless.h",    "SIOCSIWFREQ",  0x8b04},
+       {"linux/wireless.h",    "SIOCGIWFREQ",  0x8b05},
+       {"linux/wireless.h",    "SIOCSIWMODE",  0x8b06},
+       {"linux/wireless.h",    "SIOCGIWMODE",  0x8b07},
+       {"linux/wireless.h",    "SIOCSIWSENS",  0x8b08},
+       {"linux/wireless.h",    "SIOCGIWSENS",  0x8b09},
+       {"linux/wireless.h",    "SIOCSIWRANGE", 0x8b0a},
+       {"linux/wireless.h",    "SIOCGIWRANGE", 0x8b0b},
+       {"linux/wireless.h",    "SIOCSIWPRIV",  0x8b0c},
+       {"linux/wireless.h",    "SIOCGIWPRIV",  0x8b0d},
+       {"linux/wireless.h",    "SIOCSIWSTATS", 0x8b0e},
+       {"linux/wireless.h",    "SIOCGIWSTATS", 0x8b0f},
+       {"linux/wireless.h",    "SIOCSIWSPY",   0x8b10},
+       {"linux/wireless.h",    "SIOCGIWSPY",   0x8b11},
+       {"linux/wireless.h",    "SIOCSIWAP",    0x8b14},
+       {"linux/wireless.h",    "SIOCGIWAP",    0x8b15},
+       {"linux/wireless.h",    "SIOCGIWAPLIST",        0x8b17},
+       {"linux/wireless.h",    "SIOCSIWSCAN",  0x8b18},
+       {"linux/wireless.h",    "SIOCGIWSCAN",  0x8b19},
+       {"linux/wireless.h",    "SIOCSIWESSID", 0x8b1a},
+       {"linux/wireless.h",    "SIOCGIWESSID", 0x8b1b},
+       {"linux/wireless.h",    "SIOCSIWNICKN", 0x8b1c},
+       {"linux/wireless.h",    "SIOCGIWNICKN", 0x8b1d},
+       {"linux/wireless.h",    "SIOCSIWRATE",  0x8b20},
+       {"linux/wireless.h",    "SIOCGIWRATE",  0x8b21},
+       {"linux/wireless.h",    "SIOCSIWRTS",   0x8b22},
+       {"linux/wireless.h",    "SIOCGIWRTS",   0x8b23},
+       {"linux/wireless.h",    "SIOCSIWFRAG",  0x8b24},
+       {"linux/wireless.h",    "SIOCGIWFRAG",  0x8b25},
+       {"linux/wireless.h",    "SIOCSIWTXPOW", 0x8b26},
+       {"linux/wireless.h",    "SIOCGIWTXPOW", 0x8b27},
+       {"linux/wireless.h",    "SIOCSIWRETRY", 0x8b28},
+       {"linux/wireless.h",    "SIOCGIWRETRY", 0x8b29},
+       {"linux/wireless.h",    "SIOCSIWENCODE",        0x8b2a},
+       {"linux/wireless.h",    "SIOCGIWENCODE",        0x8b2b},
+       {"linux/wireless.h",    "SIOCSIWPOWER", 0x8b2c},
+       {"linux/wireless.h",    "SIOCGIWPOWER", 0x8b2d},
+       {"linux/wireless.h",    "SIOCIWFIRSTPRIV",      0x8be0},
+       {"linux/wireless.h",    "SIOCIWLASTPRIV",       0x8bff},
        {"linux/auto_fs.h",     "AUTOFS_IOC_READY",     0x9360},
        {"linux/auto_fs.h",     "AUTOFS_IOC_FAIL",      0x9361},
        {"linux/auto_fs.h",     "AUTOFS_IOC_CATATONIC", 0x9362},

diff --git a/linux/ioctlsort.c b/linux/ioctlsort.c
index 735e131e6a1d8905395b9bacf3c20131350731b5..fcccf38a43bce7040f6795d5a416f8f10e9b6b30 100644 (file)
--- a/linux/ioctlsort.c
+++ b/linux/ioctlsort.c
@@ -1,6 +1,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/types.h>
+#include <stdint.h>
 
 #include <asm/ioctl.h>
 #include <linux/types.h>
@@ -33,13 +35,16 @@ int compare(const void* a, const void* b) {
 int main(int argc, char** argv) {
        int i;
 
+#ifdef POWERPC                 /* unspeakable kludge */
+       for (i = 0; i < nioctls; i++)
+               ioctls[i].code &= ~_IOC_DIRMASK;
+#endif
+
        qsort(ioctls, nioctls, sizeof(ioctls[0]), compare);
        puts ("\t/* Generated by ioctlsort */");
        for (i = 0; i < nioctls; i++)
                printf("\t{\"%s\",\t\"%s\",\t%#lx},\n",
                        ioctls[i].header, ioctls[i].name, ioctls[i].code);
-       
+
        return 0;
 }
-
-

diff --git a/linux/powerpc/ioctlent.h b/linux/powerpc/ioctlent.h
index a62c773aee69a68fe51b5ca393a9621dadb0eaea..59aba3bbb91706575f5e6045a8231c6a76894c38 100644 (file)
--- a/linux/powerpc/ioctlent.h
+++ b/linux/powerpc/ioctlent.h
@@ -1,37 +1,4 @@
-       {"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",        "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},
+       /* Generated by ioctlsort */
        {"linux/fs.h",  "FIBMAP",       0x1},
        {"linux/fs.h",  "FIGETBSZ",     0x2},
        {"linux/fd.h",  "FDGETPRM",     0x204},
@@ -59,17 +26,6 @@
        {"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},
@@ -84,17 +40,24 @@
        {"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",  "BLKGETLASTSECT",       0x126c},
+       {"linux/fs.h",  "BLKSETLASTSECT",       0x126d},
        {"linux/fs.h",  "BLKBSZGET",    0x1270},
        {"linux/fs.h",  "BLKBSZSET",    0x1271},
-       {"linux/fs.h",  "BLKGETSIZE64", 0x1272},
-       {"linux/i2o.h", "BLKI2OGRSTRAT",        0x3201},
-       {"linux/i2o.h", "BLKI2OGWSTRAT",        0x3202},
-       {"linux/i2o.h", "BLKI2OSRSTRAT",        0x3203},
-       {"linux/i2o.h", "BLKI2OSWSTRAT",        0x3204},
+       {"linux/audit.h",       "AUIOCATTACH",  0x4065},
+       {"linux/audit.h",       "AUIOCDETACH",  0x4066},
+       {"linux/audit.h",       "AUIOCSUSPEND", 0x4067},
+       {"linux/audit.h",       "AUIOCRESUME",  0x4068},
+       {"linux/audit.h",       "AUIOCCLRPOLICY",       0x4069},
+       {"linux/audit.h",       "AUIOCSETPOLICY",       0x406a},
+       {"linux/audit.h",       "AUIOCIAMAUDITD",       0x406b},
+       {"linux/audit.h",       "AUIOCSETAUDITID",      0x406c},
+       {"linux/audit.h",       "AUIOCLOGIN",   0x406e},
+       {"linux/audit.h",       "AUIOCUSERMESSAGE",     0x406f},
+       {"linux/audit.h",       "AUIOCCLRFILTER",       0x4070},
+       {"linux/audit.h",       "AUIOCSETFILTER",       0x4071},
        {"linux/agpgart.h",     "AGPIOC_INFO",  0x4100},
        {"linux/agpgart.h",     "AGPIOC_ACQUIRE",       0x4101},
        {"linux/apm_bios.h",    "APM_IOC_STANDBY",      0x4101},
@@ -119,13 +82,11 @@
        {"linux/cciss_ioctl.h", "CCISS_SETNODENAME",    0x4205},
        {"linux/pmu.h", "PMU_IOC_CAN_SLEEP",    0x4205},
        {"linux/cciss_ioctl.h", "CCISS_GETHEARTBEAT",   0x4206},
-       {"linux/pmu.h", "PMU_IOC_GRAB_BACKLIGHT",       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/cciss_ioctl.h", "CCISS_GETLUNINFO",     0x4211},
        {"linux/soundcard.h",   "SNDCTL_COPR_RESET",    0x4300},
        {"linux/capi.h",        "CAPI_REGISTER",        0x4301},
        {"linux/soundcard.h",   "SNDCTL_COPR_LOAD",     0x4301},
@@ -161,7 +122,27 @@
        {"linux/input.h",       "EVIOCSGAIN",   0x4582},
        {"linux/input.h",       "EVIOCSAUTOCENTER",     0x4583},
        {"linux/input.h",       "EVIOCGEFFECTS",        0x4584},
+       {"linux/fb.h",  "FBIOGET_VSCREENINFO",  0x4600},
+       {"linux/fb.h",  "FBIOPUT_VSCREENINFO",  0x4601},
+       {"linux/fb.h",  "FBIOGET_FSCREENINFO",  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",  "FBIOGET_VBLANK",       0x4612},
+       {"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/fb.h",  "FBIOPUT_MODEINFO",     0x4617},
+       {"linux/fb.h",  "FBIOGET_DISPINFO",     0x4618},
        {"linux/hiddev.h",      "HIDIOCGVERSION",       0x4801},
        {"linux/hiddev.h",      "HIDIOCAPPLICATION",    0x4802},
        {"linux/hiddev.h",      "HIDIOCGDEVINFO",       0x4803},
@@ -203,6 +184,52 @@
        {"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/soundcard.h",   "SOUND_MIXER_INFO",     0x4d65},
        {"linux/soundcard.h",   "SOUND_OLD_MIXER_INFO", 0x4d65},
        {"linux/soundcard.h",   "SOUND_MIXER_ACCESS",   0x4d66},
@@ -226,8 +253,8 @@
        {"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",   "SOUND_PCM_WRITE_FILTER",       0x5007},
        {"linux/soundcard.h",   "SNDCTL_DSP_POST",      0x5008},
        {"linux/soundcard.h",   "SNDCTL_DSP_SUBDIVIDE", 0x5009},
        {"linux/soundcard.h",   "SNDCTL_DSP_SETFRAGMENT",       0x500a},
@@ -278,41 +305,51 @@
        {"linux/random.h",      "RNDADDENTROPY",        0x5203},
        {"linux/random.h",      "RNDZAPENTCNT", 0x5204},
        {"linux/random.h",      "RNDCLEARPOOL", 0x5206},
-       {"sound/asequencer.h",  "SNDRV_SEQ_IOCTL_PVERSION",     0x5300},
-       {"sound/asequencer.h",  "SNDRV_SEQ_IOCTL_CLIENT_ID",    0x5301},
-       {"sound/asequencer.h",  "SNDRV_SEQ_IOCTL_SYSTEM_INFO",  0x5302},
-       {"sound/asequencer.h",  "SNDRV_SEQ_IOCTL_RUNNING_MODE", 0x5303},
-       {"sound/asequencer.h",  "SNDRV_SEQ_IOCTL_GET_CLIENT_INFO",      0x5310},
-       {"sound/asequencer.h",  "SNDRV_SEQ_IOCTL_SET_CLIENT_INFO",      0x5311},
-       {"sound/asequencer.h",  "SNDRV_SEQ_IOCTL_CREATE_PORT",  0x5320},
-       {"sound/asequencer.h",  "SNDRV_SEQ_IOCTL_DELETE_PORT",  0x5321},
-       {"sound/asequencer.h",  "SNDRV_SEQ_IOCTL_GET_PORT_INFO",        0x5322},
-       {"sound/asequencer.h",  "SNDRV_SEQ_IOCTL_SET_PORT_INFO",        0x5323},
-       {"sound/asequencer.h",  "SNDRV_SEQ_IOCTL_SUBSCRIBE_PORT",       0x5330},
-       {"sound/asequencer.h",  "SNDRV_SEQ_IOCTL_UNSUBSCRIBE_PORT",     0x5331},
-       {"sound/asequencer.h",  "SNDRV_SEQ_IOCTL_CREATE_QUEUE", 0x5332},
-       {"sound/asequencer.h",  "SNDRV_SEQ_IOCTL_DELETE_QUEUE", 0x5333},
-       {"sound/asequencer.h",  "SNDRV_SEQ_IOCTL_GET_QUEUE_INFO",       0x5334},
-       {"sound/asequencer.h",  "SNDRV_SEQ_IOCTL_SET_QUEUE_INFO",       0x5335},
-       {"sound/asequencer.h",  "SNDRV_SEQ_IOCTL_GET_NAMED_QUEUE",      0x5336},
-       {"sound/asequencer.h",  "SNDRV_SEQ_IOCTL_GET_QUEUE_STATUS",     0x5340},
-       {"sound/asequencer.h",  "SNDRV_SEQ_IOCTL_GET_QUEUE_TEMPO",      0x5341},
-       {"sound/asequencer.h",  "SNDRV_SEQ_IOCTL_SET_QUEUE_TEMPO",      0x5342},
-       {"sound/asequencer.h",  "SNDRV_SEQ_IOCTL_GET_QUEUE_OWNER",      0x5343},
-       {"sound/asequencer.h",  "SNDRV_SEQ_IOCTL_SET_QUEUE_OWNER",      0x5344},
-       {"sound/asequencer.h",  "SNDRV_SEQ_IOCTL_GET_QUEUE_TIMER",      0x5345},
-       {"sound/asequencer.h",  "SNDRV_SEQ_IOCTL_SET_QUEUE_TIMER",      0x5346},
-       {"sound/asequencer.h",  "SNDRV_SEQ_IOCTL_GET_QUEUE_CLIENT",     0x5349},
-       {"sound/asequencer.h",  "SNDRV_SEQ_IOCTL_SET_QUEUE_CLIENT",     0x534a},
-       {"sound/asequencer.h",  "SNDRV_SEQ_IOCTL_GET_CLIENT_POOL",      0x534b},
-       {"sound/asequencer.h",  "SNDRV_SEQ_IOCTL_SET_CLIENT_POOL",      0x534c},
-       {"sound/asequencer.h",  "SNDRV_SEQ_IOCTL_REMOVE_EVENTS",        0x534e},
-       {"sound/asequencer.h",  "SNDRV_SEQ_IOCTL_QUERY_SUBS",   0x534f},
-       {"sound/asequencer.h",  "SNDRV_SEQ_IOCTL_GET_SUBSCRIPTION",     0x5350},
-       {"sound/asequencer.h",  "SNDRV_SEQ_IOCTL_QUERY_NEXT_CLIENT",    0x5351},
-       {"sound/asequencer.h",  "SNDRV_SEQ_IOCTL_QUERY_NEXT_PORT",      0x5352},
-       {"sound/asequencer.h",  "SNDRV_SEQ_IOCTL_GET_QUEUE_SYNC",       0x5353},
-       {"sound/asequencer.h",  "SNDRV_SEQ_IOCTL_SET_QUEUE_SYNC",       0x5354},
+       {"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},
+       {"linux/cdrom.h",       "CDROMAUDIOBUFSIZ",     0x5382},
+       {"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},
        {"linux/soundcard.h",   "SNDCTL_TMR_TIMEBASE",  0x5401},
        {"linux/soundcard.h",   "SNDCTL_TMR_START",     0x5402},
        {"linux/soundcard.h",   "SNDCTL_TMR_STOP",      0x5403},
@@ -321,8 +358,42 @@
        {"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},
        {"linux/if_tun.h",      "TUNSETNOCSUM", 0x54c8},
        {"linux/if_tun.h",      "TUNSETDEBUG",  0x54c9},
        {"linux/if_tun.h",      "TUNSETIFF",    0x54ca},
@@ -346,14 +417,25 @@
        {"linux/usbdevice_fs.h",        "USBDEVFS_HUB_PORTINFO",        0x5513},
        {"linux/usbdevice_fs.h",        "USBDEVFS_RESET",       0x5514},
        {"linux/usbdevice_fs.h",        "USBDEVFS_CLEAR_HALT",  0x5515},
+       {"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/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},
@@ -400,7 +482,6 @@
        {"linux/atmdev.h",      "ATM_SETESIF",  0x618d},
        {"linux/atm_tcp.h",     "ATMTCP_CREATE",        0x618e},
        {"linux/atm_tcp.h",     "ATMTCP_REMOVE",        0x618f},
-       {"linux/atmbr2684.h",   "BR2684_SETFILT",       0x6190},
        {"linux/atmlec.h",      "ATMLEC_CTRL",  0x61d0},
        {"linux/atmlec.h",      "ATMLEC_DATA",  0x61d1},
        {"linux/atmlec.h",      "ATMLEC_MCAST", 0x61d2},
@@ -414,7 +495,6 @@
        {"linux/atmsvc.h",      "ATMSIGD_CTRL", 0x61f0},
        {"linux/atmdev.h",      "ATM_SETSC",    0x61f1},
        {"linux/atmdev.h",      "ATM_SETBACKEND",       0x61f2},
-       {"linux/atmdev.h",      "ATM_NEWBACKENDIF",     0x61f3},
        {"linux/coda.h",        "CIOC_KERNEL_VERSION",  0x630a},
        {"linux/comstats.h",    "COM_GETPORTSTATS",     0x631e},
        {"linux/comstats.h",    "COM_CLRPORTSTATS",     0x631f},
@@ -424,12 +504,12 @@
        {"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/devfs_fs.h",    "DEVFSDIOC_SET_EVENT_MASK",     0x6402},
        {"linux/video_decoder.h",       "DECODER_SET_NORM",     0x6403},
-       {"linux/devfs_fs.h",    "DEVFSDIOC_SET_DEBUG_MASK",     0x6404},
+       {"linux/devfs_fs.h",    "DEVFSDIOC_RELEASE_EVENT_QUEUE",        0x6403},
        {"linux/video_decoder.h",       "DECODER_SET_INPUT",    0x6404},
+       {"linux/devfs_fs.h",    "DEVFSDIOC_SET_DEBUG_MASK",     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},
@@ -450,8 +530,6 @@
        {"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/termios.h",       "FIOASYNC",     0x667d},
        {"asm/ioctls.h",        "FIONBIO",      0x667e},
@@ -459,7 +537,6 @@
        {"asm/ioctls.h",        "FIONREAD",     0x667f},
        {"asm/termios.h",       "FIONREAD",     0x667f},
        {"asm/ioctls.h",        "FIOQSIZE",     0x6680},
-       {"asm/termios.h",       "FIOQSIZE",     0x6680},
        {"linux/i2o-dev.h",     "I2OGETIOPS",   0x6900},
        {"linux/i2o-dev.h",     "I2OHRTGET",    0x6901},
        {"linux/i2o-dev.h",     "I2OLCTGET",    0x6902},
@@ -472,14 +549,6 @@
        {"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},
@@ -493,28 +562,28 @@
        {"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/soundcard.h",   "SNDCTL_MIDI_PRETIME",  0x6d00},
+       {"linux/synclink.h",    "MGSL_IOCGPARAMS",      0x6d01},
        {"linux/mtio.h",        "MTIOCTOP",     0x6d01},
        {"linux/soundcard.h",   "SNDCTL_MIDI_MPUMODE",  0x6d01},
-       {"linux/synclink.h",    "MGSL_IOCGPARAMS",      0x6d01},
+       {"linux/synclink.h",    "MGSL_IOCSTXIDLE",      0x6d02},
        {"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/mtio.h",        "MTIOCPOS",     0x6d03},
        {"linux/synclink.h",    "MGSL_IOCTXENABLE",     0x6d04},
-       {"linux/mtio.h",        "MTIOCSETCONFIG",       0x6d05},
+       {"linux/mtio.h",        "MTIOCGETCONFIG",       0x6d04},
        {"linux/synclink.h",    "MGSL_IOCRXENABLE",     0x6d05},
-       {"linux/mtio.h",        "MTIOCRDFTSEG", 0x6d06},
+       {"linux/mtio.h",        "MTIOCSETCONFIG",       0x6d05},
        {"linux/synclink.h",    "MGSL_IOCTXABORT",      0x6d06},
-       {"linux/mtio.h",        "MTIOCWRFTSEG", 0x6d07},
+       {"linux/mtio.h",        "MTIOCRDFTSEG", 0x6d06},
        {"linux/synclink.h",    "MGSL_IOCGSTATS",       0x6d07},
-       {"linux/mtio.h",        "MTIOCVOLINFO", 0x6d08},
+       {"linux/mtio.h",        "MTIOCWRFTSEG", 0x6d07},
        {"linux/synclink.h",    "MGSL_IOCWAITEVENT",    0x6d08},
-       {"linux/mtio.h",        "MTIOCGETSIZE", 0x6d09},
+       {"linux/mtio.h",        "MTIOCVOLINFO", 0x6d08},
        {"linux/synclink.h",    "MGSL_IOCLOOPTXDONE",   0x6d09},
+       {"linux/mtio.h",        "MTIOCGETSIZE", 0x6d09},
        {"linux/mtio.h",        "MTIOCFTFORMAT",        0x6d0a},
        {"linux/mtio.h",        "MTIOCFTCMD",   0x6d0b},
        {"linux/synclink.h",    "MGSL_IOCCLRMODCOUNT",  0x6d0f},
@@ -526,8 +595,8 @@
        {"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_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},
@@ -539,11 +608,11 @@
        {"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_SET_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_SET_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},
@@ -583,8 +652,6 @@
        {"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},
@@ -597,7 +664,6 @@
        {"linux/intermezzo_fs.h",       "PRESTO_DO_REINT",      0x7031},
        {"linux/intermezzo_fs.h",       "PRESTO_REINT_END",     0x7032},
        {"linux/nvram.h",       "NVRAM_INIT",   0x7040},
-       {"asm/nvram.h", "PMAC_NVRAM_GET_OFFSET",        0x7040},
        {"linux/nvram.h",       "NVRAM_SETCKS", 0x7041},
        {"linux/ppdev.h",       "PPSETMODE",    0x7080},
        {"linux/ppdev.h",       "PPRSTATUS",    0x7081},
@@ -623,6 +689,18 @@
        {"linux/ppdev.h",       "PPGETFLAGS",   0x709a},
        {"linux/ppdev.h",       "PPSETFLAGS",   0x709b},
        {"linux/serio.h",       "SPIOCSTYPE",   0x7101},
+       {"linux/videotext.h",   "VTXIOCGETINFO",        0x7101},
+       {"linux/videotext.h",   "VTXIOCCLRPAGE",        0x7102},
+       {"linux/videotext.h",   "VTXIOCCLRFOUND",       0x7103},
+       {"linux/videotext.h",   "VTXIOCPAGEREQ",        0x7104},
+       {"linux/videotext.h",   "VTXIOCGETSTAT",        0x7105},
+       {"linux/videotext.h",   "VTXIOCGETPAGE",        0x7106},
+       {"linux/videotext.h",   "VTXIOCSTOPDAU",        0x7107},
+       {"linux/videotext.h",   "VTXIOCPUTPAGE",        0x7108},
+       {"linux/videotext.h",   "VTXIOCSETDISP",        0x7109},
+       {"linux/videotext.h",   "VTXIOCPUTSTAT",        0x710a},
+       {"linux/videotext.h",   "VTXIOCCLRCACHE",       0x710b},
+       {"linux/videotext.h",   "VTXIOCSETVIRT",        0x710c},
        {"linux/telephony.h",   "PHONE_CAPABILITIES",   0x7180},
        {"linux/telephony.h",   "PHONE_CAPABILITIES_LIST",      0x7181},
        {"linux/telephony.h",   "PHONE_CAPABILITIES_CHECK",     0x7182},
@@ -712,11 +790,14 @@
        {"linux/ixjuser.h",     "IXJCTL_SC_TXG",        0x71eb},
        {"linux/ixjuser.h",     "IXJCTL_INTERCOM_START",        0x71fd},
        {"linux/ixjuser.h",     "IXJCTL_INTERCOM_STOP", 0x71fe},
+       {"linux/videotext.h",   "TUNIOCGETINFO",        0x7201},
        {"linux/msdos_fs.h",    "VFAT_IOCTL_READDIR_BOTH",      0x7201},
+       {"linux/videotext.h",   "TUNIOCRESET",  0x7202},
        {"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/videotext.h",   "TUNIOCSETFREQ",        0x7203},
+       {"linux/videotext.h",   "TUNIOCGETFREQ",        0x7204},
+       {"linux/videotext.h",   "TUNIOCSETCHAN",        0x7205},
+       {"linux/videotext.h",   "TUNIOCGETCHAN",        0x7206},
        {"linux/cdk.h", "STL_BINTR",    0x7314},
        {"linux/cdk.h", "STL_BSTART",   0x7315},
        {"linux/cdk.h", "STL_BSTOP",    0x7316},
@@ -783,8 +864,8 @@
        {"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/if_ppp.h",      "PPPIOCGFLAGS", 0x745a},
        {"linux/jffs.h",        "JFFS_PRINT_TREE",      0x745b},
        {"linux/jffs.h",        "JFFS_GET_STATUS",      0x745c},
        {"asm/ioctls.h",        "TIOCSWINSZ",   0x7467},
@@ -825,20 +906,13 @@
        {"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},
@@ -866,10 +940,127 @@
        {"linux/meye.h",        "MEYEIOC_SYNC", 0x76c3},
        {"linux/meye.h",        "MEYEIOC_STILLCAPT",    0x76c4},
        {"linux/meye.h",        "MEYEIOC_STILLJCAPT",   0x76c5},
-       {"linux/dn.h",  "SIOCSNETADDR", 0x89e0},
+       {"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",     "SIOCGIFDIVERT",        0x8944},
+       {"linux/sockios.h",     "SIOCSIFDIVERT",        0x8945},
+       {"linux/sockios.h",     "SIOCETHTOOL",  0x8946},
+       {"linux/sockios.h",     "SIOCGMIIPHY",  0x8947},
+       {"linux/sockios.h",     "SIOCGMIIREG",  0x8948},
+       {"linux/sockios.h",     "SIOCSMIIREG",  0x8949},
+       {"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",     "SIOCGIFVLAN",  0x8982},
+       {"linux/sockios.h",     "SIOCSIFVLAN",  0x8983},
+       {"linux/sockios.h",     "SIOCBONDENSLAVE",      0x8990},
+       {"linux/sockios.h",     "SIOCBONDRELEASE",      0x8991},
+       {"linux/sockios.h",     "SIOCBONDSETHWADDR",    0x8992},
+       {"linux/sockios.h",     "SIOCBONDSLAVEINFOQUERY",       0x8993},
+       {"linux/sockios.h",     "SIOCBONDINFOQUERY",    0x8994},
+       {"linux/sockios.h",     "SIOCBONDCHANGEACTIVE", 0x8995},
        {"linux/dn.h",  "OSIOCSNETADDR",        0x89e0},
-       {"linux/dn.h",  "SIOCGNETADDR", 0x89e1},
+       {"linux/sockios.h",     "SIOCPROTOPRIVATE",     0x89e0},
+       {"linux/dn.h",  "SIOCSNETADDR", 0x89e0},
        {"linux/dn.h",  "OSIOCGNETADDR",        0x89e1},
+       {"linux/dn.h",  "SIOCGNETADDR", 0x89e1},
+       {"linux/sockios.h",     "SIOCDEVPRIVATE",       0x89f0},
+       {"linux/wireless.h",    "SIOCIWFIRST",  0x8b00},
+       {"linux/wireless.h",    "SIOCSIWCOMMIT",        0x8b00},
+       {"linux/wireless.h",    "SIOCGIWNAME",  0x8b01},
+       {"linux/wireless.h",    "SIOCSIWNWID",  0x8b02},
+       {"linux/wireless.h",    "SIOCGIWNWID",  0x8b03},
+       {"linux/wireless.h",    "SIOCSIWFREQ",  0x8b04},
+       {"linux/wireless.h",    "SIOCGIWFREQ",  0x8b05},
+       {"linux/wireless.h",    "SIOCSIWMODE",  0x8b06},
+       {"linux/wireless.h",    "SIOCGIWMODE",  0x8b07},
+       {"linux/wireless.h",    "SIOCSIWSENS",  0x8b08},
+       {"linux/wireless.h",    "SIOCGIWSENS",  0x8b09},
+       {"linux/wireless.h",    "SIOCSIWRANGE", 0x8b0a},
+       {"linux/wireless.h",    "SIOCGIWRANGE", 0x8b0b},
+       {"linux/wireless.h",    "SIOCSIWPRIV",  0x8b0c},
+       {"linux/wireless.h",    "SIOCGIWPRIV",  0x8b0d},
+       {"linux/wireless.h",    "SIOCSIWSTATS", 0x8b0e},
+       {"linux/wireless.h",    "SIOCGIWSTATS", 0x8b0f},
+       {"linux/wireless.h",    "SIOCSIWSPY",   0x8b10},
+       {"linux/wireless.h",    "SIOCGIWSPY",   0x8b11},
+       {"linux/wireless.h",    "SIOCSIWAP",    0x8b14},
+       {"linux/wireless.h",    "SIOCGIWAP",    0x8b15},
+       {"linux/wireless.h",    "SIOCGIWAPLIST",        0x8b17},
+       {"linux/wireless.h",    "SIOCSIWSCAN",  0x8b18},
+       {"linux/wireless.h",    "SIOCGIWSCAN",  0x8b19},
+       {"linux/wireless.h",    "SIOCSIWESSID", 0x8b1a},
+       {"linux/wireless.h",    "SIOCGIWESSID", 0x8b1b},
+       {"linux/wireless.h",    "SIOCSIWNICKN", 0x8b1c},
+       {"linux/wireless.h",    "SIOCGIWNICKN", 0x8b1d},
+       {"linux/wireless.h",    "SIOCSIWRATE",  0x8b20},
+       {"linux/wireless.h",    "SIOCGIWRATE",  0x8b21},
+       {"linux/wireless.h",    "SIOCSIWRTS",   0x8b22},
+       {"linux/wireless.h",    "SIOCGIWRTS",   0x8b23},
+       {"linux/wireless.h",    "SIOCSIWFRAG",  0x8b24},
+       {"linux/wireless.h",    "SIOCGIWFRAG",  0x8b25},
+       {"linux/wireless.h",    "SIOCSIWTXPOW", 0x8b26},
+       {"linux/wireless.h",    "SIOCGIWTXPOW", 0x8b27},
+       {"linux/wireless.h",    "SIOCSIWRETRY", 0x8b28},
+       {"linux/wireless.h",    "SIOCGIWRETRY", 0x8b29},
+       {"linux/wireless.h",    "SIOCSIWENCODE",        0x8b2a},
+       {"linux/wireless.h",    "SIOCGIWENCODE",        0x8b2b},
+       {"linux/wireless.h",    "SIOCSIWPOWER", 0x8b2c},
+       {"linux/wireless.h",    "SIOCGIWPOWER", 0x8b2d},
+       {"linux/wireless.h",    "SIOCIWFIRSTPRIV",      0x8be0},
+       {"linux/wireless.h",    "SIOCIWLASTPRIV",       0x8bff},
        {"linux/auto_fs.h",     "AUTOFS_IOC_READY",     0x9360},
        {"linux/auto_fs.h",     "AUTOFS_IOC_FAIL",      0x9361},
        {"linux/auto_fs.h",     "AUTOFS_IOC_CATATONIC", 0x9362},
@@ -923,5 +1114,4 @@
        {"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", 0xfe9a},
        {"linux/lvm.h", "LVM_LOCK_LVM", 0xff00},