New upstream CVS snapshot.

- debian/patches/41_io_unlock_ioremove.patch: Removed, merged upstream.
- debian/patches/42_disable_ioperm.patch: Likewise.
- debian/patches/43_debvice_port_fix.patch: Likewise.
- debian/patches/44_more_ports.patch: Likewise.
- debian/patches/45_io_per_task.patch: Likewise.
- debian/patches/46_io_device.patch: Likewise.
- debian/patches/20_mmx_support.patch: Sync.
- debian/patches/90_autoconf_autogen.patch: Regenerated.

1 files changed, 79 insertions, 72 deletions

diff --git a/debian/patches/90_autoconf_autogen.patch b/debian/patches/90_autoconf_autogen.patch
index 81092f1..64a52ea 100644
--- a/debian/patches/90_autoconf_autogen.patch
+++ b/debian/patches/90_autoconf_autogen.patch
@@ -5,30 +5,31 @@ Regenerate with:
        find -name autom4te.cache -o -name '*~' | xargs rm -rf
 
 
---- config.h.in	2007-04-05 06:42:10.000000000 +0300
-+++ config.h.in	2007-04-05 06:53:47.000000000 +0300
-@@ -43,6 +43,9 @@
- /* option floppy: Linux device driver for PC floppy */
+--- config.h.in	2007-05-26 09:04:36.000000000 +0300
++++ config.h.in	2007-05-26 09:25:20.000000000 +0300
+@@ -45,6 +45,9 @@
+    default and for qemu */
  #undef CONFIG_BLK_DEV_FD
  
 +/* Force DMA on IDE block devices */
 +#undef CONFIG_BLK_DEV_FORCE_DMA
 +
- /* option ide: Linux device driver for IDE disk controllers */
+ /* option ide: Linux device driver for IDE disk controllers; on ix86-at
+    enabled by default and for qemu */
  #undef CONFIG_BLK_DEV_IDE
- 
-@@ -319,6 +322,9 @@
- /* option seeq8005: Linux device driver for Ethernet controller Seeq8005 */
+@@ -347,6 +350,10 @@
+    ix86-at enabled by default */
  #undef CONFIG_SEEQ8005
  
-+/* option sis900: Linux device driver for Ethernet controller SiS 900 */
++/* option sis900: Linux device driver for Ethernet controller SiS 900; on
++   ix86-at enabled by default */
 +#undef CONFIG_SIS900
 +
  /* option sk_g16: Linux device driver for Ethernet controller Schneider & Koch
-    G16 */
+    G16; on ix86-at enabled by default */
  #undef CONFIG_SK_G16
---- configure	2007-04-05 06:42:06.000000000 +0300
-+++ configure	2007-04-05 06:53:42.000000000 +0300
+--- configure	2007-05-26 09:04:32.000000000 +0300
++++ configure	2007-05-26 09:25:15.000000000 +0300
 @@ -821,6 +821,8 @@ device_driver_rtl8139_TRUE
  device_driver_rtl8139_FALSE
  device_driver_seeq8005_TRUE
@@ -38,24 +39,24 @@ Regenerate with:
  device_driver_sk_g16_TRUE
  device_driver_sk_g16_FALSE
  device_driver_smc_ultra_TRUE
-@@ -1489,6 +1491,7 @@ Optional Features:
-                           default for ix86-at
-   --enable-ide            Linux device driver for IDE disk controllers;
-                           enabled by default for ix86-at
+@@ -1493,6 +1495,7 @@ Optional Features:
+                           enabled by default and for qemu
+   --enable-ide            Linux device driver for IDE disk controllers; on
+                           ix86-at enabled by default and for qemu
 +  --enable-ide-forcedma   enable forced use of DMA on IDE
    --enable-53c78xx        Linux device driver for SCSI controller NCR
-                           53C7,8xx; enabled by default for ix86-at
+                           53C7,8xx; on ix86-at enabled by default
    --enable-AM53C974       Linux device driver for SCSI controller AM53/79C974
-@@ -1656,6 +1659,8 @@ Optional Features:
-                           enabled by default for ix86-at
+@@ -1659,6 +1662,8 @@ Optional Features:
+                           ix86-at enabled by default
    --enable-seeq8005       Linux device driver for Ethernet controller
-                           Seeq8005; enabled by default for ix86-at
+                           Seeq8005; on ix86-at enabled by default
 +  --enable-sis900         Linux device driver for Ethernet controller SiS 900;
-+                          enabled by default for ix86-at
++                          on ix86-at enabled by default
    --enable-sk_g16         Linux device driver for Ethernet controller
-                           Schneider & Koch G16; enabled by default for ix86-at
+                           Schneider & Koch G16; on ix86-at enabled by default
    --enable-smc-ultra      Linux device driver for Ethernet controller SMC
-@@ -6408,6 +6413,17 @@ _ACEOF
+@@ -6442,6 +6447,17 @@ _ACEOF
  fi
  
  
@@ -73,7 +74,7 @@ Regenerate with:
  
  
  
-@@ -9109,6 +9125,46 @@ fi
+@@ -9526,6 +9542,52 @@ fi
  
  
  unset enableval
@@ -82,10 +83,16 @@ Regenerate with:
 +  enableval=$enable_sis900;
 +fi
 +
-+#TODO.
++#TODO.  Could use some M4 magic to avoid a lot of shell code.
 +case $host_platform:$host_cpu in
 +  at:i?86)
-+    enableval=${enableval-$enable_default_device_drivers};;
++    case $enable_device_drivers:'Linux device driver for Ethernet controller SiS 900; on ix86-at enabled
++    by default' in
++      default:*by\ default* | qemu:*for\ qemu*)
++        enableval=${enableval-yes};;
++      *)
++        enableval=${enableval-no};;
++    esac;;
 +  *)
 +    if [ x"$enableval" = xyes ]; then
 +      # TODO.  That might not always be true.
@@ -120,7 +127,7 @@ Regenerate with:
  # Check whether --enable-sk_g16 was given.
  if test "${enable_sk_g16+set}" = set; then
    enableval=$enable_sk_g16;
-@@ -11076,6 +11132,13 @@ echo "$as_me: error: conditional \"devic
+@@ -11630,6 +11692,13 @@ echo "$as_me: error: conditional \"devic
  Usually this means the macro was only invoked conditionally." >&2;}
     { (exit 1); exit 1; }; }
  fi
@@ -134,7 +141,7 @@ Regenerate with:
  if test -z "${device_driver_sk_g16_TRUE}" && test -z "${device_driver_sk_g16_FALSE}"; then
    { { echo "$as_me:$LINENO: error: conditional \"device_driver_sk_g16\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
-@@ -12181,6 +12244,8 @@ device_driver_rtl8139_TRUE!$device_drive
+@@ -12735,6 +12804,8 @@ device_driver_rtl8139_TRUE!$device_drive
  device_driver_rtl8139_FALSE!$device_driver_rtl8139_FALSE$ac_delim
  device_driver_seeq8005_TRUE!$device_driver_seeq8005_TRUE$ac_delim
  device_driver_seeq8005_FALSE!$device_driver_seeq8005_FALSE$ac_delim
@@ -143,7 +150,7 @@ Regenerate with:
  device_driver_sk_g16_TRUE!$device_driver_sk_g16_TRUE$ac_delim
  device_driver_sk_g16_FALSE!$device_driver_sk_g16_FALSE$ac_delim
  device_driver_smc_ultra_TRUE!$device_driver_smc_ultra_TRUE$ac_delim
-@@ -12228,8 +12293,6 @@ device_driver_smc91c92_cs_FALSE!$device_
+@@ -12782,8 +12853,6 @@ device_driver_smc91c92_cs_FALSE!$device_
  device_driver_xirc2ps_cs_TRUE!$device_driver_xirc2ps_cs_TRUE$ac_delim
  device_driver_xirc2ps_cs_FALSE!$device_driver_xirc2ps_cs_FALSE$ac_delim
  device_driver_orinoco_cs_TRUE!$device_driver_orinoco_cs_TRUE$ac_delim
@@ -152,7 +159,7 @@ Regenerate with:
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -12271,6 +12334,8 @@ _ACEOF
+@@ -12825,6 +12894,8 @@ _ACEOF
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
@@ -161,7 +168,7 @@ Regenerate with:
  device_driver_group_net_FALSE!$device_driver_group_net_FALSE$ac_delim
  device_driver_group_pcmcia_TRUE!$device_driver_group_pcmcia_TRUE$ac_delim
  device_driver_group_pcmcia_FALSE!$device_driver_group_pcmcia_FALSE$ac_delim
-@@ -12284,7 +12349,7 @@ LIBOBJS!$LIBOBJS$ac_delim
+@@ -12838,7 +12909,7 @@ LIBOBJS!$LIBOBJS$ac_delim
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
@@ -170,8 +177,8 @@ Regenerate with:
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
---- Makefile.in	2007-04-05 06:42:17.000000000 +0300
-+++ Makefile.in	2007-04-05 06:53:53.000000000 +0300
+--- Makefile.in	2007-05-26 09:04:43.000000000 +0300
++++ Makefile.in	2007-05-26 09:25:28.000000000 +0300
 @@ -161,28 +161,6 @@
  # Tests.
  #
@@ -382,7 +389,7 @@ Regenerate with:
  @HOST_ix86_TRUE@	i386/i386/ast.h \
  @HOST_ix86_TRUE@	i386/i386/ast_check.c \
  @HOST_ix86_TRUE@	i386/i386/ast_types.h \
-@@ -843,21 +822,21 @@ DIST_COMMON = README $(am__configure_dep
+@@ -844,21 +823,21 @@ DIST_COMMON = README $(am__configure_dep
  #
  
  # Instead of listing each file individually...
@@ -407,7 +414,7 @@ Regenerate with:
  @HOST_ix86_TRUE@	chips/busses.c \
  @HOST_ix86_TRUE@	chips/busses.h \
  @HOST_ix86_TRUE@	device/cirbuf.c
-@@ -868,14 +847,14 @@ DIST_COMMON = README $(am__configure_dep
+@@ -869,14 +848,14 @@ DIST_COMMON = README $(am__configure_dep
  #
  
  # See Makefrag.am about lib_dep_tr_for_defs.a.
@@ -425,7 +432,7 @@ Regenerate with:
  @HOST_ix86_TRUE@@PLATFORM_at_TRUE@	--defsym _START=0x100000 \
  @HOST_ix86_TRUE@@PLATFORM_at_TRUE@	-T '$(srcdir)'/i386/ldscript
  
-@@ -961,10 +940,10 @@ am__libkernel_a_SOURCES_DIST = ddb/db_ac
+@@ -962,10 +941,10 @@ am__libkernel_a_SOURCES_DIST = ddb/db_ac
  	kern/time_out.h kern/time_stamp.c kern/time_stamp.h \
  	kern/timer.c kern/timer.h kern/xpr.c kern/xpr.h kern/zalloc.c \
  	kern/zalloc.h kern/elf-load.c kern/boot_script.c \
@@ -440,7 +447,7 @@ Regenerate with:
  	vm/vm_object.c vm/vm_object.h vm/vm_page.h vm/vm_pageout.c \
  	vm/vm_pageout.h vm/vm_resident.c vm/vm_user.c vm/vm_user.h \
  	device/blkio.c device/buf.h device/chario.c device/cirbuf.h \
-@@ -1118,9 +1097,10 @@ am_libkernel_a_OBJECTS = $(am__objects_2
+@@ -1120,9 +1099,10 @@ am_libkernel_a_OBJECTS = $(am__objects_2
  	kern/xpr.$(OBJEXT) kern/zalloc.$(OBJEXT) \
  	kern/elf-load.$(OBJEXT) kern/boot_script.$(OBJEXT) \
  	util/putchar.$(OBJEXT) util/puts.$(OBJEXT) \
@@ -454,7 +461,7 @@ Regenerate with:
  	vm/vm_object.$(OBJEXT) vm/vm_pageout.$(OBJEXT) \
  	vm/vm_resident.$(OBJEXT) vm/vm_user.$(OBJEXT) \
  	device/blkio.$(OBJEXT) device/chario.$(OBJEXT) \
-@@ -1265,7 +1245,8 @@ am__liblinux_a_SOURCES_DIST = linux/dev/
+@@ -1267,7 +1247,8 @@ am__liblinux_a_SOURCES_DIST = linux/dev/
  	linux/src/drivers/net/rtl8139.c \
  	linux/src/drivers/net/seeq8005.c \
  	linux/src/drivers/net/seeq8005.h \
@@ -464,7 +471,7 @@ Regenerate with:
  	linux/src/drivers/net/smc-ultra.c \
  	linux/src/drivers/net/smc-ultra32.c \
  	linux/src/drivers/net/starfire.c \
-@@ -1375,23 +1356,24 @@ am__liblinux_a_SOURCES_DIST = linux/dev/
+@@ -1377,23 +1358,24 @@ am__liblinux_a_SOURCES_DIST = linux/dev/
  @device_driver_pcnet32_TRUE@am__objects_78 = linux/src/drivers/net/liblinux_a-pcnet32.$(OBJEXT)
  @device_driver_rtl8139_TRUE@am__objects_79 = linux/src/drivers/net/liblinux_a-rtl8139.$(OBJEXT)
  @device_driver_seeq8005_TRUE@am__objects_80 = linux/src/drivers/net/liblinux_a-seeq8005.$(OBJEXT)
@@ -503,7 +510,7 @@ Regenerate with:
  am_liblinux_a_OBJECTS = linux/dev/init/liblinux_a-version.$(OBJEXT) \
  	linux/dev/kernel/liblinux_a-softirq.$(OBJEXT) \
  	linux/src/arch/i386/lib/liblinux_a-delay.$(OBJEXT) \
-@@ -1438,7 +1420,7 @@ am_liblinux_a_OBJECTS = linux/dev/init/l
+@@ -1440,7 +1422,7 @@ am_liblinux_a_OBJECTS = linux/dev/init/l
  	$(am__objects_85) $(am__objects_86) $(am__objects_87) \
  	$(am__objects_88) $(am__objects_89) $(am__objects_90) \
  	$(am__objects_91) $(am__objects_92) $(am__objects_93) \
@@ -512,7 +519,7 @@ Regenerate with:
  liblinux_a_OBJECTS = $(am_liblinux_a_OBJECTS)
  liblinux_pcmcia_cs_clients_a_AR = $(AR) $(ARFLAGS)
  liblinux_pcmcia_cs_clients_a_LIBADD =
-@@ -1453,19 +1435,19 @@ am__liblinux_pcmcia_cs_clients_a_SOURCES
+@@ -1455,19 +1437,19 @@ am__liblinux_pcmcia_cs_clients_a_SOURCES
  	linux/src/drivers/net/8390.c linux/pcmcia-cs/clients/ositech.h \
  	linux/pcmcia-cs/clients/smc91c92_cs.c \
  	linux/pcmcia-cs/clients/xirc2ps_cs.c
@@ -544,7 +551,7 @@ Regenerate with:
  liblinux_pcmcia_cs_clients_a_OBJECTS =  \
  	$(am_liblinux_pcmcia_cs_clients_a_OBJECTS)
  liblinux_pcmcia_cs_modules_a_AR = $(AR) $(ARFLAGS)
-@@ -1490,7 +1472,7 @@ am__liblinux_pcmcia_cs_modules_a_SOURCES
+@@ -1492,7 +1474,7 @@ am__liblinux_pcmcia_cs_modules_a_SOURCES
  	linux/pcmcia-cs/modules/topic.h \
  	linux/pcmcia-cs/modules/vg468.h \
  	linux/pcmcia-cs/modules/yenta.h
@@ -553,7 +560,7 @@ Regenerate with:
  am_liblinux_pcmcia_cs_modules_a_OBJECTS = linux/pcmcia-cs/glue/liblinux_pcmcia_cs_modules_a-pcmcia.$(OBJEXT) \
  	linux/pcmcia-cs/modules/liblinux_pcmcia_cs_modules_a-cs.$(OBJEXT) \
  	linux/pcmcia-cs/modules/liblinux_pcmcia_cs_modules_a-ds.$(OBJEXT) \
-@@ -1498,7 +1480,7 @@ am_liblinux_pcmcia_cs_modules_a_OBJECTS 
+@@ -1500,7 +1482,7 @@ am_liblinux_pcmcia_cs_modules_a_OBJECTS 
  	linux/pcmcia-cs/modules/liblinux_pcmcia_cs_modules_a-bulkmem.$(OBJEXT) \
  	linux/pcmcia-cs/modules/liblinux_pcmcia_cs_modules_a-cistpl.$(OBJEXT) \
  	linux/pcmcia-cs/modules/liblinux_pcmcia_cs_modules_a-pci_fixup.$(OBJEXT) \
@@ -562,7 +569,7 @@ Regenerate with:
  liblinux_pcmcia_cs_modules_a_OBJECTS =  \
  	$(am_liblinux_pcmcia_cs_modules_a_OBJECTS)
  liblinux_pcmcia_cs_wireless_a_AR = $(AR) $(ARFLAGS)
-@@ -1512,10 +1494,10 @@ am__liblinux_pcmcia_cs_wireless_a_SOURCE
+@@ -1514,10 +1496,10 @@ am__liblinux_pcmcia_cs_wireless_a_SOURCE
  	linux/pcmcia-cs/wireless/orinoco.c \
  	linux/pcmcia-cs/wireless/orinoco.h \
  	linux/pcmcia-cs/wireless/orinoco_cs.c
@@ -575,7 +582,7 @@ Regenerate with:
  liblinux_pcmcia_cs_wireless_a_OBJECTS =  \
  	$(am_liblinux_pcmcia_cs_wireless_a_OBJECTS)
  am__installdirs = "$(DESTDIR)$(exec_bootdir)" "$(DESTDIR)$(infodir)" \
-@@ -1557,14 +1539,13 @@ DIST_SOURCES = $(am__libkernel_a_SOURCES
+@@ -1559,14 +1541,13 @@ DIST_SOURCES = $(am__libkernel_a_SOURCES
  	$(am__liblinux_pcmcia_cs_modules_a_SOURCES_DIST) \
  	$(am__liblinux_pcmcia_cs_wireless_a_SOURCES_DIST) \
  	$(gnumach_SOURCES) $(gnumach_o_SOURCES)
@@ -595,7 +602,7 @@ Regenerate with:
  TEXI2DVI = texi2dvi
  TEXI2PDF = $(TEXI2DVI) --pdf --batch
  MAKEINFOHTML = $(MAKEINFO) --html
-@@ -1846,6 +1827,8 @@ device_driver_seagate_FALSE = @device_dr
+@@ -1848,6 +1829,8 @@ device_driver_seagate_FALSE = @device_dr
  device_driver_seagate_TRUE = @device_driver_seagate_TRUE@
  device_driver_seeq8005_FALSE = @device_driver_seeq8005_FALSE@
  device_driver_seeq8005_TRUE = @device_driver_seeq8005_TRUE@
@@ -604,7 +611,7 @@ Regenerate with:
  device_driver_sk_g16_FALSE = @device_driver_sk_g16_FALSE@
  device_driver_sk_g16_TRUE = @device_driver_sk_g16_TRUE@
  device_driver_smc91c92_cs_FALSE = @device_driver_smc91c92_cs_FALSE@
-@@ -1948,8 +1931,7 @@ EXTRA_DIST = gensym.awk ipc/mach_port.sr
+@@ -1950,8 +1933,7 @@ EXTRA_DIST = gensym.awk ipc/mach_port.sr
  	linux/src/drivers/scsi/NCR5380.h linux/src/drivers/net/8390.h \
  	linux/src/drivers/net/kern_compat.h linux/pcmcia-cs/glue/ds.c \
  	linux/dev/README linux/src/COPYING linux/dev/include \
@@ -614,7 +621,7 @@ Regenerate with:
  	Makefile.correct_output_files_for_.S_files.patch \
  	config.status.dep.patch ChangeLog.0 ChangeLog.00 DEVELOPMENT
  
-@@ -1972,9 +1954,9 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-kdb
+@@ -1974,9 +1956,9 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-kdb
  # <http://lists.gnu.org/archive/html/automake/2006-10/msg00039.html> about what
  # we really want to do.
  noinst_LIBRARIES = libkernel.a lib_dep_tr_for_defs.a $(am__append_4) \
@@ -626,7 +633,7 @@ Regenerate with:
  #	kern/mach.server.defs
  #	kern/mach4.server.defs
  #	kern/mach_debug.server.defs
-@@ -2071,10 +2053,10 @@ libkernel_a_SOURCES = $(am__append_2) ip
+@@ -2073,10 +2055,10 @@ libkernel_a_SOURCES = $(am__append_2) ip
  	kern/time_out.h kern/time_stamp.c kern/time_stamp.h \
  	kern/timer.c kern/timer.h kern/xpr.c kern/xpr.h kern/zalloc.c \
  	kern/zalloc.h kern/elf-load.c kern/boot_script.c \
@@ -641,7 +648,7 @@ Regenerate with:
  	vm/vm_object.c vm/vm_object.h vm/vm_page.h vm/vm_pageout.c \
  	vm/vm_pageout.h vm/vm_resident.c vm/vm_user.c vm/vm_user.h \
  	device/blkio.c device/buf.h device/chario.c device/cirbuf.h \
-@@ -2085,9 +2067,9 @@ libkernel_a_SOURCES = $(am__append_2) ip
+@@ -2087,9 +2069,9 @@ libkernel_a_SOURCES = $(am__append_2) ip
  	device/ds_routines.c device/ds_routines.h device/errno.h \
  	device/if_ether.h device/if_hdr.h device/io_req.h \
  	device/net_io.c device/net_io.h device/param.h device/subrs.c \
@@ -654,7 +661,7 @@ Regenerate with:
  
  #
  # Version number.
-@@ -2111,10 +2093,10 @@ nodist_libkernel_a_SOURCES = version.c v
+@@ -2113,10 +2095,10 @@ nodist_libkernel_a_SOURCES = version.c v
  	kern/mach4.server.msgids kern/mach_debug.server.h \
  	kern/mach_debug.server.c kern/mach_debug.server.msgids \
  	kern/mach_host.server.h kern/mach_host.server.c \
@@ -668,7 +675,7 @@ Regenerate with:
  
  #
  # Installation.
-@@ -2217,7 +2199,7 @@ nodist_lib_dep_tr_for_defs_a_SOURCES =  
+@@ -2219,7 +2201,7 @@ nodist_lib_dep_tr_for_defs_a_SOURCES =  
  	device/device.server.defs.c device/device_pager.server.defs.c \
  	ipc/mach_port.server.defs.c kern/mach.server.defs.c \
  	kern/mach4.server.defs.c kern/mach_debug.server.defs.c \
@@ -677,7 +684,7 @@ Regenerate with:
  # Preprocess only.
  lib_dep_tr_for_defs_a_CPPFLAGS = $(AM_CPPFLAGS) \
  	-E
-@@ -2278,7 +2260,8 @@ liblinux_a_SOURCES = linux/dev/init/vers
+@@ -2280,7 +2262,8 @@ liblinux_a_SOURCES = linux/dev/init/vers
  	$(am__append_85) $(am__append_86) $(am__append_87) \
  	$(am__append_88) $(am__append_89) $(am__append_90) \
  	$(am__append_91) $(am__append_92) $(am__append_93) \
@@ -687,7 +694,7 @@ Regenerate with:
  
  # pcmcia-cs.
  liblinux_pcmcia_cs_modules_a_CPPFLAGS = $(liblinux_a_CPPFLAGS) \
-@@ -2295,24 +2278,24 @@ liblinux_pcmcia_cs_modules_a_SOURCES = l
+@@ -2297,24 +2280,24 @@ liblinux_pcmcia_cs_modules_a_SOURCES = l
  	linux/pcmcia-cs/modules/rsrc_mgr.c \
  	linux/pcmcia-cs/modules/bulkmem.c \
  	linux/pcmcia-cs/modules/cistpl.c \
@@ -718,7 +725,7 @@ Regenerate with:
  
  #
  # Installation.
-@@ -2338,14 +2321,6 @@ liblinux_pcmcia_cs_wireless_a_SOURCES = 
+@@ -2340,14 +2323,6 @@ liblinux_pcmcia_cs_wireless_a_SOURCES = 
  @HOST_ix86_TRUE@	i386/include/mach/i386/vm_param.h \
  @HOST_ix86_TRUE@	i386/include/mach/i386/vm_types.h
  
@@ -733,7 +740,7 @@ Regenerate with:
  
  # Makerules: how to do some things.
  
-@@ -2354,6 +2329,7 @@ web = doc/web
+@@ -2356,6 +2331,7 @@ web = doc/web
  # Test suite.
  
  # Documentation.
@@ -741,7 +748,7 @@ Regenerate with:
  
  #
  # Kernel Image
-@@ -2388,7 +2364,7 @@ all: config.h
+@@ -2390,7 +2366,7 @@ all: config.h
  .SUFFIXES: .S .c .dvi .o .obj .ps
  am--refresh:
  	@:
@@ -750,7 +757,7 @@ Regenerate with:
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
  	    *$$dep*) \
-@@ -2678,6 +2654,8 @@ util/putchar.$(OBJEXT): util/$(am__dirst
+@@ -2680,6 +2656,8 @@ util/putchar.$(OBJEXT): util/$(am__dirst
  	util/$(DEPDIR)/$(am__dirstamp)
  util/puts.$(OBJEXT): util/$(am__dirstamp) \
  	util/$(DEPDIR)/$(am__dirstamp)
@@ -759,7 +766,7 @@ Regenerate with:
  vm/memory_object.$(OBJEXT): vm/$(am__dirstamp) \
  	vm/$(DEPDIR)/$(am__dirstamp)
  vm/vm_debug.$(OBJEXT): vm/$(am__dirstamp) vm/$(DEPDIR)/$(am__dirstamp)
-@@ -3282,6 +3260,9 @@ linux/src/drivers/net/liblinux_a-rtl8139
+@@ -3286,6 +3264,9 @@ linux/src/drivers/net/liblinux_a-rtl8139
  linux/src/drivers/net/liblinux_a-seeq8005.$(OBJEXT):  \
  	linux/src/drivers/net/$(am__dirstamp) \
  	linux/src/drivers/net/$(DEPDIR)/$(am__dirstamp)
@@ -769,7 +776,7 @@ Regenerate with:
  linux/src/drivers/net/liblinux_a-sk_g16.$(OBJEXT):  \
  	linux/src/drivers/net/$(am__dirstamp) \
  	linux/src/drivers/net/$(DEPDIR)/$(am__dirstamp)
-@@ -3711,6 +3692,7 @@ mostlyclean-compile:
+@@ -3716,6 +3697,7 @@ mostlyclean-compile:
  	-rm -f linux/src/drivers/net/liblinux_a-pcnet32.$(OBJEXT)
  	-rm -f linux/src/drivers/net/liblinux_a-rtl8139.$(OBJEXT)
  	-rm -f linux/src/drivers/net/liblinux_a-seeq8005.$(OBJEXT)
@@ -777,7 +784,7 @@ Regenerate with:
  	-rm -f linux/src/drivers/net/liblinux_a-sk_g16.$(OBJEXT)
  	-rm -f linux/src/drivers/net/liblinux_a-smc-ultra.$(OBJEXT)
  	-rm -f linux/src/drivers/net/liblinux_a-smc-ultra32.$(OBJEXT)
-@@ -3769,6 +3751,7 @@ mostlyclean-compile:
+@@ -3774,6 +3756,7 @@ mostlyclean-compile:
  	-rm -f vm/lib_dep_tr_for_defs_a-memory_object_user.user.defs.$(OBJEXT)
  	-rm -f vm/memory_object.$(OBJEXT)
  	-rm -f vm/memory_object_default.user.$(OBJEXT)
@@ -785,7 +792,7 @@ Regenerate with:
  	-rm -f vm/memory_object_user.user.$(OBJEXT)
  	-rm -f vm/vm_debug.$(OBJEXT)
  	-rm -f vm/vm_external.$(OBJEXT)
-@@ -4027,6 +4010,7 @@ distclean-compile:
+@@ -4033,6 +4016,7 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote@linux/src/drivers/net/$(DEPDIR)/liblinux_a-pcnet32.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@linux/src/drivers/net/$(DEPDIR)/liblinux_a-rtl8139.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@linux/src/drivers/net/$(DEPDIR)/liblinux_a-seeq8005.Po@am__quote@
@@ -793,7 +800,7 @@ Regenerate with:
  @AMDEP_TRUE@@am__include@ @am__quote@linux/src/drivers/net/$(DEPDIR)/liblinux_a-sk_g16.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@linux/src/drivers/net/$(DEPDIR)/liblinux_a-smc-ultra.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@linux/src/drivers/net/$(DEPDIR)/liblinux_a-smc-ultra32.Po@am__quote@
-@@ -4085,6 +4069,7 @@ distclean-compile:
+@@ -4091,6 +4075,7 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote@vm/$(DEPDIR)/lib_dep_tr_for_defs_a-memory_object_user.user.defs.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@vm/$(DEPDIR)/memory_object.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@vm/$(DEPDIR)/memory_object_default.user.Po@am__quote@
@@ -801,7 +808,7 @@ Regenerate with:
  @AMDEP_TRUE@@am__include@ @am__quote@vm/$(DEPDIR)/memory_object_user.user.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@vm/$(DEPDIR)/vm_debug.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@vm/$(DEPDIR)/vm_external.Po@am__quote@
-@@ -5805,6 +5790,20 @@ linux/src/drivers/net/liblinux_a-seeq800
+@@ -5811,6 +5796,20 @@ linux/src/drivers/net/liblinux_a-seeq800
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblinux_a_CPPFLAGS) $(CPPFLAGS) $(liblinux_a_CFLAGS) $(CFLAGS) -c -o linux/src/drivers/net/liblinux_a-seeq8005.obj `if test -f 'linux/src/drivers/net/seeq8005.c'; then $(CYGPATH_W) 'linux/src/drivers/net/seeq8005.c'; else $(CYGPATH_W) '$(srcdir)/linux/src/drivers/net/seeq8005.c'; fi`
  
@@ -822,7 +829,7 @@ Regenerate with:
  linux/src/drivers/net/liblinux_a-sk_g16.o: linux/src/drivers/net/sk_g16.c
  @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblinux_a_CPPFLAGS) $(CPPFLAGS) $(liblinux_a_CFLAGS) $(CFLAGS) -MT linux/src/drivers/net/liblinux_a-sk_g16.o -MD -MP -MF "linux/src/drivers/net/$(DEPDIR)/liblinux_a-sk_g16.Tpo" -c -o linux/src/drivers/net/liblinux_a-sk_g16.o `test -f 'linux/src/drivers/net/sk_g16.c' || echo '$(srcdir)/'`linux/src/drivers/net/sk_g16.c; \
  @am__fastdepCC_TRUE@	then mv -f "linux/src/drivers/net/$(DEPDIR)/liblinux_a-sk_g16.Tpo" "linux/src/drivers/net/$(DEPDIR)/liblinux_a-sk_g16.Po"; else rm -f "linux/src/drivers/net/$(DEPDIR)/liblinux_a-sk_g16.Tpo"; exit 1; fi
-@@ -6266,74 +6265,6 @@ linux/pcmcia-cs/wireless/liblinux_pcmcia
+@@ -6272,74 +6271,6 @@ linux/pcmcia-cs/wireless/liblinux_pcmcia
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='linux/pcmcia-cs/wireless/orinoco_cs.c' object='linux/pcmcia-cs/wireless/liblinux_pcmcia_cs_wireless_a-orinoco_cs.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblinux_pcmcia_cs_wireless_a_CPPFLAGS) $(CPPFLAGS) $(liblinux_pcmcia_cs_wireless_a_CFLAGS) $(CFLAGS) -c -o linux/pcmcia-cs/wireless/liblinux_pcmcia_cs_wireless_a-orinoco_cs.obj `if test -f 'linux/pcmcia-cs/wireless/orinoco_cs.c'; then $(CYGPATH_W) 'linux/pcmcia-cs/wireless/orinoco_cs.c'; else $(CYGPATH_W) '$(srcdir)/linux/pcmcia-cs/wireless/orinoco_cs.c'; fi`
@@ -897,7 +904,7 @@ Regenerate with:
  .dvi.ps:
  	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
  	$(DVIPS) -o $@ $<
-@@ -6379,9 +6310,7 @@ dist-info: $(INFO_DEPS)
+@@ -6385,9 +6316,7 @@ dist-info: $(INFO_DEPS)
  	done
  
  mostlyclean-aminfo:
@@ -908,7 +915,7 @@ Regenerate with:
  
  maintainer-clean-aminfo:
  	@list='$(INFO_DEPS)'; for i in $$list; do \
-@@ -6683,7 +6612,7 @@ check-TESTS: $(TESTS)
+@@ -6689,7 +6618,7 @@ check-TESTS: $(TESTS)
  distdir: $(DISTFILES)
  	$(am__remove_distdir)
  	mkdir $(distdir)
@@ -917,7 +924,7 @@ Regenerate with:
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
  	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
  	list='$(DISTFILES)'; for file in $$list; do \
-@@ -6862,7 +6791,6 @@ distclean-generic:
+@@ -6868,7 +6797,6 @@ distclean-generic:
  	-rm -f ddb/$(am__dirstamp)
  	-rm -f device/$(DEPDIR)/$(am__dirstamp)
  	-rm -f device/$(am__dirstamp)
@@ -925,7 +932,7 @@ Regenerate with:
  	-rm -f i386/i386/$(DEPDIR)/$(am__dirstamp)
  	-rm -f i386/i386/$(am__dirstamp)
  	-rm -f i386/i386at/$(DEPDIR)/$(am__dirstamp)
-@@ -6940,7 +6868,7 @@ dvi-am: $(DVIS)
+@@ -6946,7 +6874,7 @@ dvi-am: $(DVIS)
  
  html: html-recursive
  
@@ -934,7 +941,7 @@ Regenerate with:
  
  info: info-recursive
  
-@@ -6996,20 +6924,20 @@ maintainer-clean: maintainer-clean-recur
+@@ -7002,20 +6930,20 @@ maintainer-clean: maintainer-clean-recur
  	-rm -rf ./$(DEPDIR) chips/$(DEPDIR) ddb/$(DEPDIR) device/$(DEPDIR) i386/i386/$(DEPDIR) i386/i386at/$(DEPDIR) i386/intel/$(DEPDIR) ipc/$(DEPDIR) kern/$(DEPDIR) linux/dev/arch/i386/kernel/$(DEPDIR) linux/dev/drivers/block/$(DEPDIR) linux/dev/drivers/net/$(DEPDIR) linux/dev/drivers/scsi/$(DEPDIR) linux/dev/glue/$(DEPDIR) linux/dev/init/$(DEPDIR) linux/dev/kernel/$(DEPDIR) linux/dev/lib/$(DEPDIR) linux/dev/net/core/$(DEPDIR) linux/pcmcia-cs/clients/$(DEPDIR) linux/pcmcia-cs/glue/$(DEPDIR) linux/pcmcia-cs/modules/$(DEPDIR) linux/pcmcia-cs/wireless/$(DEPDIR) linux/src/arch/i386/kernel/$(DEPDIR) linux/src/arch/i386/lib/$(DEPDIR) linux/src/drivers/block/$(DEPDIR) linux/src/drivers/net/$(DEPDIR) linux/src/drivers/pci/$(DEPDIR) linux/src/drivers/scsi/$(DEPDIR) linux/src/lib/$(DEPDIR) util/$(DEPDIR) vm/$(DEPDIR)
  	-rm -f Makefile
  maintainer-clean-am: distclean-am maintainer-clean-aminfo \
@@ -959,7 +966,7 @@ Regenerate with:
  
  uninstall-am: uninstall-exec_bootPROGRAMS uninstall-exec_msgidsDATA \
  	uninstall-include_deviceHEADERS uninstall-include_machHEADERS \
-@@ -7026,19 +6954,18 @@ uninstall-info: uninstall-info-recursive
+@@ -7032,19 +6960,18 @@ uninstall-info: uninstall-info-recursive
  	distcheck distclean distclean-compile distclean-generic \
  	distclean-hdr distclean-recursive distclean-tags \
  	distcleancheck distdir distuninstallcheck dvi dvi-am html \
@@ -987,7 +994,7 @@ Regenerate with:
  	uninstall-exec_bootPROGRAMS uninstall-exec_msgidsDATA \
  	uninstall-include_deviceHEADERS uninstall-include_machHEADERS \
  	uninstall-include_mach_eXecHEADERS \
-@@ -7178,87 +7105,6 @@ dist-hook-linux:
+@@ -7184,87 +7111,6 @@ dist-hook-linux:
  #
  
  # ix86.