summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2007-02-11 13:56:46 +0000
committerGuillem Jover <guillem@debian.org>2007-02-11 13:56:46 +0000
commit91ef6c53f83bc4ac0ffc6bd572ca2b7c58ca4a29 (patch)
tree03755f16442c72e73718b86f75142c23d2472747
parent5f21d2a236d1938ad1a8a0c189bbf461e7b68540 (diff)
New upstream CVS snapshot.
- debian/patches/22_scsi_inf_loop.patch: Removed, merged upstream. - debian/patches/47_pcmcia_isa.patch: Likewise. - debian/patches/10_cdromlock.patch: Sync. - debian/patches/12_sis900.patch: Likewise. - debian/patches/15_mem_obj_proxy.patch: Likewise. - debian/patches/90_autoconf_autogen.patch: Regenerated.
Diffstat
-rw-r--r--debian/changelog12
-rw-r--r--debian/patches/10_cdromlock.patch25
-rw-r--r--debian/patches/12_sis900.patch34
-rw-r--r--debian/patches/15_mem_obj_proxy.patch36
-rw-r--r--debian/patches/22_scsi_inf_loop.patch21
-rw-r--r--debian/patches/47_pcmcia_isa.patch39
-rw-r--r--debian/patches/90_autoconf_autogen.patch1040
-rw-r--r--debian/patches/series1
8 files changed, 455 insertions, 753 deletions
diff --git a/debian/changelog b/debian/changelog
index f7bb505..7d31039 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+gnumach (2:1.3.99+cvs20070211.dfsg.1-1) UNRELEASED; urgency=low
+
+ * New upstream CVS snapshot.
+ - debian/patches/22_scsi_inf_loop.patch: Removed, merged upstream.
+ - debian/patches/47_pcmcia_isa.patch: Likewise.
+ - debian/patches/10_cdromlock.patch: Sync.
+ - debian/patches/12_sis900.patch: Likewise.
+ - debian/patches/15_mem_obj_proxy.patch: Likewise.
+ - debian/patches/90_autoconf_autogen.patch: Regenerated.
+
+ -- Guillem Jover <guillem@debian.org> Sun, 11 Feb 2007 15:01:19 +0200
+
gnumach (2:1.3.99.dfsg.1-1) unstable; urgency=low
* New upstream CVS snapshot.
diff --git a/debian/patches/10_cdromlock.patch b/debian/patches/10_cdromlock.patch
index eefde79..9d97c95 100644
--- a/debian/patches/10_cdromlock.patch
+++ b/debian/patches/10_cdromlock.patch
@@ -1,7 +1,7 @@
Index: linux/dev/glue/block.c
===================================================================
--- linux/dev/glue/block.c.orig 2006-10-15 20:39:24.000000000 +0300
-+++ linux/dev/glue/block.c 2006-11-14 04:15:19.000000000 +0200
++++ linux/dev/glue/block.c 2007-02-11 15:06:41.000000000 +0200
@@ -789,6 +789,7 @@ static struct block_data *open_list;
extern struct device_emulation_ops linux_block_emulation_ops;
@@ -64,7 +64,7 @@ Index: linux/dev/glue/block.c
#define MAX_COPY (VM_MAP_COPY_PAGE_LIST_MAX << PAGE_SHIFT)
/* Check block BN and size COUNT for I/O validity
-@@ -1704,6 +1711,16 @@ device_get_status (void *d, dev_flavor_t
+@@ -1704,6 +1711,17 @@ device_get_status (void *d, dev_flavor_t
return D_SUCCESS;
}
@@ -73,15 +73,16 @@ Index: linux/dev/glue/block.c
+device_no_senders (mach_no_senders_notification_t *ns)
+{
+ device_t dev;
-+
-+ dev = (device_t) ((ipc_port_t) ns->not_header.msgh_remote_port) -> ip_kobject;
++
++ dev = dev_port_lookup((ipc_port_t) ns->not_header.msgh_remote_port);
++ assert(dev);
+ device_close_forced (dev->emul_data, 1);
+}
+
struct device_emulation_ops linux_block_emulation_ops =
{
NULL,
-@@ -1719,7 +1736,7 @@ struct device_emulation_ops linux_block_
+@@ -1719,7 +1737,7 @@ struct device_emulation_ops linux_block_
device_get_status,
NULL,
NULL,
@@ -90,17 +91,3 @@ Index: linux/dev/glue/block.c
NULL,
NULL
};
-Index: i386/i386at/i386at_ds_routines.c
-===================================================================
---- i386/i386at/i386at_ds_routines.c.orig 2006-11-14 03:58:56.000000000 +0200
-+++ i386/i386at/i386at_ds_routines.c 2006-11-14 04:15:19.000000000 +0200
-@@ -232,7 +232,8 @@ ds_notify (mach_msg_header_t *msg)
- mach_no_senders_notification_t *ns;
-
- ns = (mach_no_senders_notification_t *) msg;
-- dev = (device_t) ns->not_header.msgh_remote_port;
-+ dev = (device_t) ((ipc_port_t) ns->not_header.msgh_remote_port)
-+ -> ip_kobject;
- if (dev->emul_ops->no_senders)
- (*dev->emul_ops->no_senders) (ns);
- return TRUE;
diff --git a/debian/patches/12_sis900.patch b/debian/patches/12_sis900.patch
index 9d8d495..0b1e8d8 100644
--- a/debian/patches/12_sis900.patch
+++ b/debian/patches/12_sis900.patch
@@ -9,24 +9,10 @@
* linux/src/drivers/net/sis900.h: Likewise.
-Index: i386/README-Drivers
-===================================================================
---- i386/README-Drivers.orig 2006-10-15 20:39:23.000000000 +0300
-+++ i386/README-Drivers 2006-10-25 23:55:33.000000000 +0300
-@@ -365,6 +365,9 @@ Sundance ST201 "Alta" PCI Ethernet
- Winbond W89c840 PCI Ethernet
- --disable-winbond-840 net/winbond-840.c
-
-+SiS 900
-+ --enable-sis900 net/sis900.c
-+
- *** pcmcia bridge drivers
-
- All source files are relative to [GNU Mach]/linux/pcmcia-cs.
Index: linux/dev/drivers/net/Space.c
===================================================================
--- linux/dev/drivers/net/Space.c.orig 2006-02-01 22:58:10.000000000 +0200
-+++ linux/dev/drivers/net/Space.c 2006-10-25 23:55:33.000000000 +0300
++++ linux/dev/drivers/net/Space.c 2007-02-11 15:07:05.000000000 +0200
@@ -93,6 +93,7 @@ extern int yellowfin_probe(struct device
extern int eepro100_probe(struct device *);
extern int epic100_probe(struct device *);
@@ -48,7 +34,7 @@ Index: linux/dev/drivers/net/Space.c
Index: linux/src/drivers/net/sis900.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux/src/drivers/net/sis900.c 2006-10-25 23:55:33.000000000 +0300
++++ linux/src/drivers/net/sis900.c 2007-02-11 15:07:05.000000000 +0200
@@ -0,0 +1,1803 @@
+/* sis900.c: A SiS 900/7016 PCI Fast Ethernet driver for Linux.
+ Copyright 1999 Silicon Integrated System Corporation
@@ -1856,7 +1842,7 @@ Index: linux/src/drivers/net/sis900.c
Index: linux/src/drivers/net/sis900.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux/src/drivers/net/sis900.h 2006-10-25 23:55:33.000000000 +0300
++++ linux/src/drivers/net/sis900.h 2007-02-11 15:07:05.000000000 +0200
@@ -0,0 +1,284 @@
+/* sis900.h Definitions for SiS ethernet controllers including 7014/7016 and 900
+ * Copyright 1999 Silicon Integrated System Corporation
@@ -2144,8 +2130,8 @@ Index: linux/src/drivers/net/sis900.h
+#define SIOCSMIIREG (SIOCDEVPRIVATE+2) /* Write a PHY register */
Index: linux/configfrag.ac
===================================================================
---- linux/configfrag.ac.orig 2006-10-25 23:57:48.000000000 +0300
-+++ linux/configfrag.ac 2006-10-25 23:59:16.000000000 +0300
+--- linux/configfrag.ac.orig 2007-02-11 14:51:18.000000000 +0200
++++ linux/configfrag.ac 2007-02-11 15:07:05.000000000 +0200
@@ -423,6 +423,10 @@ AC_Linux_DRIVER([seeq8005],
[Ethernet controller Seeq8005],
[CONFIG_SEEQ8005],
@@ -2159,10 +2145,10 @@ Index: linux/configfrag.ac
[CONFIG_SK_G16],
Index: linux/Makefrag.am
===================================================================
---- linux/Makefrag.am.orig 2006-10-25 23:59:36.000000000 +0300
-+++ linux/Makefrag.am 2006-10-26 00:00:48.000000000 +0300
-@@ -449,6 +449,11 @@ liblinux_a_SOURCES += \
- linux/src/drivers/net/seeq8005.c
+--- linux/Makefrag.am.orig 2007-02-11 14:51:17.000000000 +0200
++++ linux/Makefrag.am 2007-02-11 15:07:05.000000000 +0200
+@@ -524,6 +524,11 @@ liblinux_a_SOURCES += \
+ linux/src/drivers/net/seeq8005.h
endif
+if device_driver_sis900
@@ -2172,4 +2158,4 @@ Index: linux/Makefrag.am
+
if device_driver_sk_g16
liblinux_a_SOURCES += \
- linux/src/drivers/net/sk_g16.c
+ linux/src/drivers/net/sk_g16.c \
diff --git a/debian/patches/15_mem_obj_proxy.patch b/debian/patches/15_mem_obj_proxy.patch
index 3ecc563..ac8a161 100644
--- a/debian/patches/15_mem_obj_proxy.patch
+++ b/debian/patches/15_mem_obj_proxy.patch
@@ -18,7 +18,7 @@
Index: i386/include/mach/i386/vm_types.h
===================================================================
--- i386/include/mach/i386/vm_types.h.orig 2006-10-15 20:39:24.000000000 +0300
-+++ i386/include/mach/i386/vm_types.h 2006-11-14 04:15:32.000000000 +0200
++++ i386/include/mach/i386/vm_types.h 2007-02-11 15:08:26.000000000 +0200
@@ -74,6 +74,7 @@ typedef unsigned int uint32;
* e.g. an offset into a virtual memory space.
*/
@@ -30,7 +30,7 @@ Index: i386/include/mach/i386/vm_types.h
Index: include/mach/mach4.defs
===================================================================
--- include/mach/mach4.defs.orig 1997-02-25 23:26:51.000000000 +0200
-+++ include/mach/mach4.defs 2006-11-14 04:15:32.000000000 +0200
++++ include/mach/mach4.defs 2007-02-11 15:08:26.000000000 +0200
@@ -79,4 +79,34 @@ skip /* pc_sampling reserved 1*/;
skip /* pc_sampling reserved 2*/;
skip /* pc_sampling reserved 3*/;
@@ -69,7 +69,7 @@ Index: include/mach/mach4.defs
Index: include/mach/memory_object.h
===================================================================
--- include/mach/memory_object.h.orig 1997-02-25 23:26:52.000000000 +0200
-+++ include/mach/memory_object.h 2006-11-14 04:15:32.000000000 +0200
++++ include/mach/memory_object.h 2007-02-11 15:08:26.000000000 +0200
@@ -46,6 +46,9 @@ typedef mach_port_t memory_object_t;
/* the object to map; used by the */
/* kernel to retrieve or store data */
@@ -83,7 +83,7 @@ Index: include/mach/memory_object.h
Index: kern/ipc_kobject.c
===================================================================
--- kern/ipc_kobject.c.orig 2006-11-14 03:58:57.000000000 +0200
-+++ kern/ipc_kobject.c 2006-11-14 04:15:32.000000000 +0200
++++ kern/ipc_kobject.c 2007-02-11 15:08:26.000000000 +0200
@@ -353,6 +353,9 @@ ipc_kobject_notify(request_header, reply
case IKOT_DEVICE:
return ds_notify(request_header);
@@ -97,7 +97,7 @@ Index: kern/ipc_kobject.c
Index: kern/ipc_kobject.h
===================================================================
--- kern/ipc_kobject.h.orig 1997-02-25 23:28:22.000000000 +0200
-+++ kern/ipc_kobject.h 2006-11-14 04:15:32.000000000 +0200
++++ kern/ipc_kobject.h 2007-02-11 15:08:26.000000000 +0200
@@ -77,9 +77,10 @@ typedef unsigned int ipc_kobject_type_t;
#define IKOT_LOCK_SET 24
#define IKOT_CLOCK 25
@@ -114,7 +114,7 @@ Index: kern/ipc_kobject.h
Index: vm/memory_object_proxy.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ vm/memory_object_proxy.c 2006-11-14 04:15:32.000000000 +0200
++++ vm/memory_object_proxy.c 2007-02-11 15:08:26.000000000 +0200
@@ -0,0 +1,200 @@
+/* memory_object_proxy.c - Proxy memory objects for Mach.
+ Copyright (C) 2005 Free Software Foundation, Inc.
@@ -180,7 +180,7 @@ Index: vm/memory_object_proxy.c
+memory_object_proxy_init (void)
+{
+ /* For limit, see PORT_MAX. */
-+ memory_object_proxy_zone = zinit (sizeof (struct memory_object_proxy),
++ memory_object_proxy_zone = zinit (sizeof (struct memory_object_proxy), 0,
+ (TASK_MAX * 3 + THREAD_MAX)
+ * sizeof (struct memory_object_proxy),
+ 256 * sizeof (struct memory_object_proxy),
@@ -319,7 +319,7 @@ Index: vm/memory_object_proxy.c
Index: vm/vm_init.c
===================================================================
--- vm/vm_init.c.orig 1997-02-25 23:28:36.000000000 +0200
-+++ vm/vm_init.c 2006-11-14 04:15:32.000000000 +0200
++++ vm/vm_init.c 2007-02-11 15:08:26.000000000 +0200
@@ -81,4 +81,5 @@ void vm_mem_bootstrap()
void vm_mem_init()
{
@@ -329,7 +329,7 @@ Index: vm/vm_init.c
Index: vm/vm_user.c
===================================================================
--- vm/vm_user.c.orig 1997-02-25 23:28:37.000000000 +0200
-+++ vm/vm_user.c 2006-11-14 04:15:32.000000000 +0200
++++ vm/vm_user.c 2007-02-11 15:08:26.000000000 +0200
@@ -275,6 +275,12 @@ kern_return_t vm_copy(map, source_addres
return KERN_SUCCESS;
}
@@ -369,13 +369,13 @@ Index: vm/vm_user.c
* Perform the copy if requested
Index: Makefrag.am
===================================================================
---- Makefrag.am.orig 2006-11-14 03:58:55.000000000 +0200
-+++ Makefrag.am 2006-11-14 04:15:32.000000000 +0200
-@@ -123,6 +123,7 @@ libkernel_a_SOURCES += \
- vm/vm_pageout.c \
- vm/vm_resident.c \
- vm/vm_user.c \
-+ vm/memory_object_proxy.c \
- vm/memory_object.c
+--- Makefrag.am.orig 2007-02-11 14:51:10.000000000 +0200
++++ Makefrag.am 2007-02-11 15:10:59.000000000 +0200
+@@ -214,6 +214,7 @@ libkernel_a_SOURCES += \
+ #
- # These device support files are always needed; the others are needed only if
+ libkernel_a_SOURCES += \
++ vm/memory_object_proxy.c \
+ vm/memory_object.c \
+ vm/memory_object.h \
+ vm/pmap.h \
diff --git a/debian/patches/22_scsi_inf_loop.patch b/debian/patches/22_scsi_inf_loop.patch
deleted file mode 100644
index 7f96819..0000000
--- a/debian/patches/22_scsi_inf_loop.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-#DPATCHLEVEL=1
-
-2006-01-15 Samuel Thibault <samuel.thibault@ens-lyon.org>
-
- Fix de4x5 PCI probe.
-
- * linux/src/drivers/net/de4x5.c (pci_probe): Keep probing only
- while pcibios_find_class succeeds.
-
---- gnumach-20050801/linux/src/drivers/net/de4x5.c 1999-04-26 07:52:00.000000000 +0200
-+++ gnumach-mine/linux/src/drivers/net/de4x5.c 2006-01-15 00:35:45.000000000 +0100
-@@ -2147,7 +2147,7 @@ pci_probe(struct device *dev, u_long ioa
- }
-
- for (index=lastPCI+1;
-- (pcibios_find_class(class, index, &pb, &dev_fn)!= PCIBIOS_DEVICE_NOT_FOUND);
-+ (pcibios_find_class(class, index, &pb, &dev_fn)== PCIBIOS_SUCCESSFUL);
- index++) {
- dev_num = PCI_SLOT(dev_fn);
- if ((!pbus && !dnum) || ((pbus == pb) && (dnum == dev_num))) {
-
diff --git a/debian/patches/47_pcmcia_isa.patch b/debian/patches/47_pcmcia_isa.patch
deleted file mode 100644
index 75e8cbc..0000000
--- a/debian/patches/47_pcmcia_isa.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-
-2006-08-28 Stefan Siegl <stesie@brokenpipe.de>
-
- * i386/linux/configure.ac: Add configuration option allowing to enable
- ISA-bus support in the pcmcia core.
-
- * i386/linux/configure: Regenerate.
- * i386/linux/device-drivers.h.in: Likewise.
-
-
-Index: i386/linux/configure.ac
-===================================================================
---- i386/linux/configure.ac.orig 2006-08-29 02:44:29.000000000 +0300
-+++ i386/linux/configure.ac 2006-08-29 02:46:43.000000000 +0300
-@@ -239,6 +239,24 @@ dnl PCMCIA device support.
-
- linux_DRIVER([i82365], [I82365], [i82365], [pcmcia])
-
-+AC_DEFUN([AC_PCMCIA_OPTION], [
-+ AC_ARG_ENABLE([pcmcia-$1],
-+ AS_HELP_STRING([--enable-pcmcia-$1], [$4]), [
-+ if test "x$enableval" != "xno"; then
-+ AC_DEFINE([CONFIG_$2], [1], [$4])
-+ device_drivers="$device_drivers [$3]"
-+ if test "${driver_class_pcmcia_selected+set}" != set; then
-+ driver_class_pcmcia_selected=yes
-+ AC_DEFINE_UNQUOTED([$driver_class_pcmcia_option], [1])
-+ device_drivers="$device_drivers $driver_class_pcmcia_files"
-+ fi
-+ fi
-+])])
-+
-+AC_PCMCIA_OPTION([isa], [ISA], [],
-+ [enable isa-bus-support (pcmcia core)])
-+
-+
- dnl PCMCIA device drivers.
-
- linux_DRIVER([3c574_cs], [3C574_CS], [3c574_cs], [pcmcia])
diff --git a/debian/patches/90_autoconf_autogen.patch b/debian/patches/90_autoconf_autogen.patch
index 9b41eac..74bf4d5 100644
--- a/debian/patches/90_autoconf_autogen.patch
+++ b/debian/patches/90_autoconf_autogen.patch
@@ -5,259 +5,8 @@ Regenerate with:
find -name autom4te.cache | xargs rm -rf
---- aclocal.m4 2006-11-14 03:58:55.000000000 +0200
-+++ aclocal.m4 2006-11-14 04:25:54.000000000 +0200
-@@ -11,8 +11,8 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
-
--m4_if(m4_PACKAGE_VERSION, [2.60],,
--[m4_fatal([this file was generated for autoconf 2.60.
-+m4_if(m4_PACKAGE_VERSION, [2.60a],,
-+[m4_fatal([this file was generated for autoconf 2.60a.
- You have another version of autoconf. If you want to use that,
- you should regenerate the build system entirely.], [63])])
-
---- build-aux/config.guess 2006-11-14 03:58:56.000000000 +0200
-+++ build-aux/config.guess 2006-11-14 04:26:12.000000000 +0200
-@@ -1,9 +1,10 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-+# Inc.
-
--timestamp='2006-02-23'
-+timestamp='2006-07-02'
-
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -210,7 +211,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
- echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
- exit ;;
- macppc:MirBSD:*:*)
-- echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-+ echo powerpc-unknown-mirbsd${UNAME_RELEASE}
- exit ;;
- *:MirBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-@@ -770,6 +771,8 @@ EOF
- case ${UNAME_MACHINE} in
- pc98)
- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+ amd64)
-+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
- *)
- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
- esac
-@@ -780,9 +783,6 @@ EOF
- i*:MINGW*:*)
- echo ${UNAME_MACHINE}-pc-mingw32
- exit ;;
-- i*:MSYS_NT-*:*:*)
-- echo ${UNAME_MACHINE}-pc-mingw32
-- exit ;;
- i*:windows32*:*)
- # uname -m includes "-pc" on this system.
- echo ${UNAME_MACHINE}-mingw32
-@@ -790,10 +790,10 @@ EOF
- i*:PW*:*)
- echo ${UNAME_MACHINE}-pc-pw32
- exit ;;
-- x86:Interix*:[345]*)
-+ x86:Interix*:[3456]*)
- echo i586-pc-interix${UNAME_RELEASE}
- exit ;;
-- EM64T:Interix*:[345]*)
-+ EM64T:Interix*:[3456]*)
- echo x86_64-unknown-interix${UNAME_RELEASE}
- exit ;;
- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-@@ -831,6 +831,9 @@ EOF
- arm*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
-+ avr32*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit ;;
- cris:Linux:*:*)
- echo cris-axis-linux-gnu
- exit ;;
-@@ -989,7 +992,7 @@ EOF
- LIBC=gnulibc1
- # endif
- #else
-- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
-+ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
- LIBC=gnu
- #else
- LIBC=gnuaout
---- build-aux/config.sub 2006-11-14 03:58:56.000000000 +0200
-+++ build-aux/config.sub 2006-11-14 04:26:12.000000000 +0200
-@@ -1,9 +1,10 @@
- #! /bin/sh
- # Configuration validation subroutine script.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-+# Inc.
-
--timestamp='2006-02-23'
-+timestamp='2006-09-20'
-
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -240,7 +241,7 @@ case $basic_machine in
- | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- | am33_2.0 \
-- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
- | bfin \
- | c4x | clipper \
- | d10v | d30v | dlx | dsp16xx \
-@@ -248,7 +249,8 @@ case $basic_machine in
- | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
- | i370 | i860 | i960 | ia64 \
- | ip2k | iq2000 \
-- | m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
-+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
-+ | maxq | mb | microblaze | mcore \
- | mips | mipsbe | mipseb | mipsel | mipsle \
- | mips16 \
- | mips64 | mips64el \
-@@ -274,21 +276,19 @@ case $basic_machine in
- | pdp10 | pdp11 | pj | pjl \
- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
- | pyramid \
-- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-+ | score \
-+ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
- | sh64 | sh64le \
-- | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-- | sparcv8 | sparcv9 | sparcv9b \
-- | strongarm \
-+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-+ | spu | strongarm \
- | tahoe | thumb | tic4x | tic80 | tron \
- | v850 | v850e \
- | we32k \
-- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
-+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
- | z8k)
- basic_machine=$basic_machine-unknown
- ;;
-- m32c)
-- basic_machine=$basic_machine-unknown
-- ;;
- m6811 | m68hc11 | m6812 | m68hc12)
- # Motorola 68HC11/12.
- basic_machine=$basic_machine-unknown
-@@ -318,7 +318,7 @@ case $basic_machine in
- | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
-- | avr-* \
-+ | avr-* | avr32-* \
- | bfin-* | bs2000-* \
- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
- | clipper-* | craynv-* | cydra-* \
-@@ -329,7 +329,7 @@ case $basic_machine in
- | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
- | i*86-* | i860-* | i960-* | ia64-* \
- | ip2k-* | iq2000-* \
-- | m32r-* | m32rle-* \
-+ | m32c-* | m32r-* | m32rle-* \
- | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | maxq-* | mcore-* \
- | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-@@ -358,23 +358,21 @@ case $basic_machine in
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
- | pyramid-* \
- | romp-* | rs6000-* \
-- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-+ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
- | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-- | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
-+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
- | sparclite-* \
-- | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
- | tahoe-* | thumb-* \
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
- | tron-* \
- | v850-* | v850e-* | vax-* \
- | we32k-* \
-- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
- | xstormy16-* | xtensa-* \
- | ymp-* \
- | z8k-*)
- ;;
-- m32c-*)
-- ;;
- # Recognize the various machine names and aliases which stand
- # for a CPU type and a company and sometimes even an OS.
- 386bsd)
-@@ -912,6 +910,10 @@ case $basic_machine in
- sb1el)
- basic_machine=mipsisa64sb1el-unknown
- ;;
-+ sde)
-+ basic_machine=mipsisa32-sde
-+ os=-elf
-+ ;;
- sei)
- basic_machine=mips-sei
- os=-seiux
-@@ -1128,7 +1130,7 @@ case $basic_machine in
- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
- basic_machine=sh-unknown
- ;;
-- sparc | sparcv8 | sparcv9 | sparcv9b)
-+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
- basic_machine=sparc-sun
- ;;
- cydra)
-@@ -1217,7 +1219,7 @@ case $os in
- | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-- | -skyos* | -haiku* | -rdos*)
-+ | -skyos* | -haiku* | -rdos* | -toppers*)
- # Remember, each alternative MUST END IN *, to match a version number.
- ;;
- -qnx*)
-@@ -1369,6 +1371,12 @@ else
- # system, and we'll never get to this point.
-
- case $basic_machine in
-+ score-*)
-+ os=-elf
-+ ;;
-+ spu-*)
-+ os=-elf
-+ ;;
- *-acorn)
- os=-riscix1.2
- ;;
-@@ -1378,9 +1386,9 @@ case $basic_machine in
- arm*-semi)
- os=-aout
- ;;
-- c4x-* | tic4x-*)
-- os=-coff
-- ;;
-+ c4x-* | tic4x-*)
-+ os=-coff
-+ ;;
- # This must come before the *-dec entry.
- pdp10-*)
- os=-tops20
---- config.h.in 2006-11-14 03:58:55.000000000 +0200
-+++ config.h.in 2006-11-14 04:26:07.000000000 +0200
+--- config.h.in 2007-02-11 15:15:11.000000000 +0200
++++ config.h.in 2007-02-11 15:19:31.000000000 +0200
@@ -43,6 +43,9 @@
/* option floppy: Linux device driver for PC floppy */
#undef CONFIG_BLK_DEV_FD
@@ -278,17 +27,9 @@ Regenerate with:
/* option sk_g16: Linux device driver for Ethernet controller Schneider & Koch
G16 */
#undef CONFIG_SK_G16
---- configure 2006-11-14 03:58:56.000000000 +0200
-+++ configure 2006-11-14 04:26:03.000000000 +0200
-@@ -1,6 +1,6 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.60 for GNU Mach 1.3.99.
-+# Generated by GNU Autoconf 2.60a for GNU Mach 1.3.99.
- #
- # Report bugs to <bug-hurd@gnu.org>.
- #
-@@ -808,6 +808,8 @@ device_driver_rtl8139_TRUE
+--- configure 2007-02-11 15:15:08.000000000 +0200
++++ configure 2007-02-11 15:19:27.000000000 +0200
+@@ -819,6 +819,8 @@ device_driver_rtl8139_TRUE
device_driver_rtl8139_FALSE
device_driver_seeq8005_TRUE
device_driver_seeq8005_FALSE
@@ -297,7 +38,7 @@ Regenerate with:
device_driver_sk_g16_TRUE
device_driver_sk_g16_FALSE
device_driver_smc_ultra_TRUE
-@@ -1466,6 +1468,7 @@ Optional Features:
+@@ -1480,6 +1482,7 @@ Optional Features:
--disable-lpr disable use of lpr device
--disable-floppy disable Linux device driver for PC floppy
--disable-ide disable Linux device driver for IDE disk controllers
@@ -305,7 +46,7 @@ Regenerate with:
--disable-53c78xx disable Linux device driver for SCSI controller NCR
53C7,8xx
--disable-AM53C974 disable Linux device driver for SCSI controller
-@@ -1608,6 +1611,8 @@ Optional Features:
+@@ -1622,6 +1625,8 @@ Optional Features:
8019/8029!)
--disable-seeq8005 disable Linux device driver for Ethernet controller
Seeq8005
@@ -314,56 +55,7 @@ Regenerate with:
--disable-sk_g16 disable Linux device driver for Ethernet controller
Schneider & Koch G16
--disable-smc-ultra disable Linux device driver for Ethernet controller
-@@ -1732,7 +1737,7 @@ test -n "$ac_init_help" && exit $ac_stat
- if $ac_init_version; then
- cat <<\_ACEOF
- GNU Mach configure 1.3.99
--generated by GNU Autoconf 2.60
-+generated by GNU Autoconf 2.60a
-
- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
- 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-@@ -1746,7 +1751,7 @@ This file contains any messages produced
- running configure, to aid debugging if configure makes a mistake.
-
- It was created by GNU Mach $as_me 1.3.99, which was
--generated by GNU Autoconf 2.60. Invocation command line was
-+generated by GNU Autoconf 2.60a. Invocation command line was
-
- $ $0 $@
-
-@@ -3209,7 +3214,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
- # in a Makefile. We should not override ac_cv_exeext if it was cached,
- # so that the user can short-circuit this test for compilers unknown to
- # Autoconf.
--for ac_file in $ac_files
-+for ac_file in $ac_files ''
- do
- test -f "$ac_file" || continue
- case $ac_file in
-@@ -3237,6 +3242,12 @@ done
- test "$ac_cv_exeext" = no && ac_cv_exeext=
-
- else
-+ ac_file=''
-+fi
-+
-+{ echo "$as_me:$LINENO: result: $ac_file" >&5
-+echo "${ECHO_T}$ac_file" >&6; }
-+if test -z "$ac_file"; then
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-@@ -3248,8 +3259,6 @@ See \`config.log' for more details." >&2
- fi
-
- ac_exeext=$ac_cv_exeext
--{ echo "$as_me:$LINENO: result: $ac_file" >&5
--echo "${ECHO_T}$ac_file" >&6; }
-
- # Check that the compiler produces executables we can run. If not, either
- # the compiler is broken, or we cross compile.
-@@ -6694,6 +6703,17 @@ _ACEOF
+@@ -6407,6 +6412,17 @@ _ACEOF
fi
@@ -381,7 +73,7 @@ Regenerate with:
-@@ -8453,6 +8473,32 @@ fi
+@@ -8300,6 +8316,34 @@ fi
unset enableval
@@ -391,7 +83,9 @@ Regenerate with:
+fi
+
+enableval=${enableval-$enable_default_device_drivers}
-+ if test x"$enableval" = xyes; then
++
++
++if test x"$enableval" = xyes; then
+ device_driver_sis900_TRUE=
+ device_driver_sis900_FALSE='#'
+else
@@ -414,7 +108,7 @@ Regenerate with:
# Check whether --enable-sk_g16 was given.
if test "${enable_sk_g16+set}" = set; then
enableval=$enable_sk_g16;
-@@ -9929,6 +9975,13 @@ echo "$as_me: error: conditional \"devic
+@@ -9860,6 +9904,13 @@ echo "$as_me: error: conditional \"devic
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -428,34 +122,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
-@@ -10427,7 +10480,7 @@ exec 6>&1
- # values after options handling.
- ac_log="
- This file was extended by GNU Mach $as_me 1.3.99, which was
--generated by GNU Autoconf 2.60. Invocation command line was
-+generated by GNU Autoconf 2.60a. Invocation command line was
-
- CONFIG_FILES = $CONFIG_FILES
- CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -10457,7 +10510,7 @@ current configuration.
- Usage: $0 [OPTIONS] [FILE]...
-
- -h, --help print this help, then exit
-- -V, --version print version number, then exit
-+ -V, --version print version number and configuration settings, then exit
- -q, --quiet do not print progress messages
- -d, --debug don't remove temporary files
- --recheck update $as_me by reconfiguring in the same conditions
-@@ -10484,7 +10537,7 @@ _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
- ac_cs_version="\\
- GNU Mach config.status 1.3.99
--configured by $0, generated by GNU Autoconf 2.60,
-+configured by $0, generated by GNU Autoconf 2.60a,
- with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-
- Copyright (C) 2006 Free Software Foundation, Inc.
-@@ -11003,6 +11056,8 @@ device_driver_rtl8139_TRUE!$device_drive
+@@ -10949,6 +11000,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
@@ -464,36 +131,36 @@ 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
-@@ -11048,8 +11103,6 @@ device_driver_pcnet_cs_FALSE!$device_dri
- device_driver_smc91c92_cs_TRUE!$device_driver_smc91c92_cs_TRUE$ac_delim
- device_driver_smc91c92_cs_FALSE!$device_driver_smc91c92_cs_FALSE$ac_delim
- 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
+@@ -10998,8 +11051,6 @@ device_driver_xirc2ps_cs_FALSE!$device_d
+ device_driver_orinoco_cs_TRUE!$device_driver_orinoco_cs_TRUE$ac_delim
+ device_driver_orinoco_cs_FALSE!$device_driver_orinoco_cs_FALSE$ac_delim
+ device_driver_group_net_TRUE!$device_driver_group_net_TRUE$ac_delim
+-device_driver_group_net_FALSE!$device_driver_group_net_FALSE$ac_delim
+-device_driver_group_pcmcia_TRUE!$device_driver_group_pcmcia_TRUE$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -11091,6 +11144,8 @@ _ACEOF
+@@ -11041,6 +11092,8 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-+device_driver_xirc2ps_cs_FALSE!$device_driver_xirc2ps_cs_FALSE$ac_delim
-+device_driver_orinoco_cs_TRUE!$device_driver_orinoco_cs_TRUE$ac_delim
- device_driver_orinoco_cs_FALSE!$device_driver_orinoco_cs_FALSE$ac_delim
- device_driver_group_net_TRUE!$device_driver_group_net_TRUE$ac_delim
- device_driver_group_net_FALSE!$device_driver_group_net_FALSE$ac_delim
-@@ -11102,7 +11157,7 @@ LIBOBJS!$LIBOBJS$ac_delim
++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
+ device_driver_group_scsi_TRUE!$device_driver_group_scsi_TRUE$ac_delim
+ device_driver_group_scsi_FALSE!$device_driver_group_scsi_FALSE$ac_delim
+@@ -11050,7 +11103,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 9; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 11; then
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 7; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 9; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
---- Makefile.in 2006-11-14 03:58:55.000000000 +0200
-+++ Makefile.in 2006-11-14 04:26:15.000000000 +0200
-@@ -109,28 +109,6 @@
+--- Makefile.in 2007-02-11 15:15:18.000000000 +0200
++++ Makefile.in 2007-02-11 15:19:38.000000000 +0200
+@@ -117,28 +117,6 @@
# Tests.
#
@@ -522,7 +189,7 @@ Regenerate with:
# Makefile fragment for Linux device drivers and the glue code.
# Copyright (C) 2006 Free Software Foundation, Inc.
-@@ -203,11 +181,9 @@ DIST_COMMON = README $(am__configure_dep
+@@ -221,15 +199,13 @@ DIST_COMMON = README $(am__configure_dep
$(include_mach_eXec_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/Makefrag.am \
$(srcdir)/Makerules.am $(srcdir)/config.h.in \
@@ -530,224 +197,199 @@ Regenerate with:
- $(srcdir)/doc/version.texi $(srcdir)/i386/Makefrag.am \
- $(srcdir)/i386/linux/Makefrag.am $(srcdir)/linux/Makefrag.am \
- $(srcdir)/tests/Makefrag.am $(srcdir)/version.c.in \
-- $(top_srcdir)/${systype}/${systype} \
+- $(top_srcdir)/configure $(top_srcdir)/tests/test-mbchk.in \
+- AUTHORS COPYING ChangeLog INSTALL NEWS build-aux/compile \
+- build-aux/config.guess build-aux/config.sub build-aux/depcomp \
+- build-aux/install-sh build-aux/mdate-sh build-aux/missing \
+- build-aux/texinfo.tex
+ $(srcdir)/i386/Makefrag.am $(srcdir)/i386/linux/Makefrag.am \
+ $(srcdir)/linux/Makefrag.am $(srcdir)/tests/Makefrag.am \
-+ $(srcdir)/version.c.in $(top_srcdir)/${systype}/${systype} \
- $(top_srcdir)/${systype}/include/mach/${systype} \
- $(top_srcdir)/configure \
- $(top_srcdir)/linux/dev/include/asm-${systype} \
-@@ -571,49 +547,52 @@ DIST_COMMON = README $(am__configure_dep
- @device_driver_seeq8005_TRUE@am__append_80 = \
- @device_driver_seeq8005_TRUE@ linux/src/drivers/net/seeq8005.c
-
--@device_driver_sk_g16_TRUE@am__append_81 = \
-+@device_driver_sis900_TRUE@am__append_81 = \
++ $(srcdir)/version.c.in $(top_srcdir)/configure \
++ $(top_srcdir)/tests/test-mbchk.in AUTHORS COPYING ChangeLog \
++ INSTALL NEWS build-aux/compile build-aux/config.guess \
++ build-aux/config.sub build-aux/depcomp build-aux/install-sh \
++ build-aux/mdate-sh build-aux/missing build-aux/texinfo.tex
+
+ # Do we want the icky kernel debugger?
+ @enable_kdb_TRUE@am__append_2 = \
+@@ -764,54 +740,57 @@ DIST_COMMON = README $(am__configure_dep
+ @device_driver_seeq8005_TRUE@ linux/src/drivers/net/seeq8005.c \
+ @device_driver_seeq8005_TRUE@ linux/src/drivers/net/seeq8005.h
+
+-@device_driver_sk_g16_TRUE@am__append_89 = \
++@device_driver_sis900_TRUE@am__append_89 = \
+@device_driver_sis900_TRUE@ linux/src/drivers/net/sis900.c
+
-+@device_driver_sk_g16_TRUE@am__append_82 = \
- @device_driver_sk_g16_TRUE@ linux/src/drivers/net/sk_g16.c
++@device_driver_sk_g16_TRUE@am__append_90 = \
+ @device_driver_sk_g16_TRUE@ linux/src/drivers/net/sk_g16.c \
+ @device_driver_sk_g16_TRUE@ linux/src/drivers/net/sk_g16.h
--@device_driver_smc_ultra_TRUE@am__append_82 = \
-+@device_driver_smc_ultra_TRUE@am__append_83 = \
+-@device_driver_smc_ultra_TRUE@am__append_90 = \
++@device_driver_smc_ultra_TRUE@am__append_91 = \
@device_driver_smc_ultra_TRUE@ linux/src/drivers/net/smc-ultra.c \
@device_driver_smc_ultra_TRUE@ linux/src/drivers/net/8390.c
--@device_driver_smc_ultra32_TRUE@am__append_83 = \
-+@device_driver_smc_ultra32_TRUE@am__append_84 = \
+-@device_driver_smc_ultra32_TRUE@am__append_91 = \
++@device_driver_smc_ultra32_TRUE@am__append_92 = \
@device_driver_smc_ultra32_TRUE@ linux/src/drivers/net/smc-ultra32.c \
@device_driver_smc_ultra32_TRUE@ linux/src/drivers/net/8390.c
--@device_driver_starfire_TRUE@am__append_84 = \
-+@device_driver_starfire_TRUE@am__append_85 = \
+-@device_driver_starfire_TRUE@am__append_92 = \
++@device_driver_starfire_TRUE@am__append_93 = \
@device_driver_starfire_TRUE@ linux/src/drivers/net/starfire.c
--@device_driver_sundance_TRUE@am__append_85 = \
-+@device_driver_sundance_TRUE@am__append_86 = \
+-@device_driver_sundance_TRUE@am__append_93 = \
++@device_driver_sundance_TRUE@am__append_94 = \
@device_driver_sundance_TRUE@ linux/src/drivers/net/sundance.c
--@device_driver_tlan_TRUE@am__append_86 = \
-+@device_driver_tlan_TRUE@am__append_87 = \
- @device_driver_tlan_TRUE@ linux/src/drivers/net/tlan.c
+-@device_driver_tlan_TRUE@am__append_94 = \
++@device_driver_tlan_TRUE@am__append_95 = \
+ @device_driver_tlan_TRUE@ linux/src/drivers/net/tlan.c \
+ @device_driver_tlan_TRUE@ linux/src/drivers/net/tlan.h
--@device_driver_tulip_TRUE@am__append_87 = \
-+@device_driver_tulip_TRUE@am__append_88 = \
+-@device_driver_tulip_TRUE@am__append_95 = \
++@device_driver_tulip_TRUE@am__append_96 = \
@device_driver_tulip_TRUE@ linux/src/drivers/net/tulip.c
--@device_driver_via_rhine_TRUE@am__append_88 = \
-+@device_driver_via_rhine_TRUE@am__append_89 = \
+-@device_driver_via_rhine_TRUE@am__append_96 = \
++@device_driver_via_rhine_TRUE@am__append_97 = \
@device_driver_via_rhine_TRUE@ linux/src/drivers/net/via-rhine.c
--@device_driver_wavelan_TRUE@am__append_89 = \
-+@device_driver_wavelan_TRUE@am__append_90 = \
- @device_driver_wavelan_TRUE@ linux/src/drivers/net/wavelan.c
+-@device_driver_wavelan_TRUE@am__append_97 = \
++@device_driver_wavelan_TRUE@am__append_98 = \
+ @device_driver_wavelan_TRUE@ linux/src/drivers/net/i82586.h \
+ @device_driver_wavelan_TRUE@ linux/src/drivers/net/wavelan.c \
+ @device_driver_wavelan_TRUE@ linux/src/drivers/net/wavelan.h \
+ @device_driver_wavelan_TRUE@ linux/dev/drivers/net/wavelan.p.h
--@device_driver_wd_TRUE@am__append_90 = \
-+@device_driver_wd_TRUE@am__append_91 = \
+-@device_driver_wd_TRUE@am__append_98 = \
++@device_driver_wd_TRUE@am__append_99 = \
@device_driver_wd_TRUE@ linux/src/drivers/net/wd.c
--@device_driver_winbond_840_TRUE@am__append_91 = \
-+@device_driver_winbond_840_TRUE@am__append_92 = \
+-@device_driver_winbond_840_TRUE@am__append_99 = \
++@device_driver_winbond_840_TRUE@am__append_100 = \
@device_driver_winbond_840_TRUE@ linux/src/drivers/net/winbond-840.c \
@device_driver_winbond_840_TRUE@ linux/src/drivers/net/8390.c
--@device_driver_yellowfin_TRUE@am__append_92 = \
-+@device_driver_yellowfin_TRUE@am__append_93 = \
+-@device_driver_yellowfin_TRUE@am__append_100 = \
++@device_driver_yellowfin_TRUE@am__append_101 = \
@device_driver_yellowfin_TRUE@ linux/src/drivers/net/yellowfin.c
--@device_driver_znet_TRUE@am__append_93 = \
-+@device_driver_znet_TRUE@am__append_94 = \
+-@device_driver_znet_TRUE@am__append_101 = \
++@device_driver_znet_TRUE@am__append_102 = \
@device_driver_znet_TRUE@ linux/src/drivers/net/znet.c
--@device_driver_group_pcmcia_TRUE@am__append_94 = \
-+@device_driver_group_pcmcia_TRUE@am__append_95 = \
+-@device_driver_group_pcmcia_TRUE@am__append_102 = \
++@device_driver_group_pcmcia_TRUE@am__append_103 = \
@device_driver_group_pcmcia_TRUE@ linux/pcmcia-cs/glue/pcmcia.c \
+ @device_driver_group_pcmcia_TRUE@ linux/pcmcia-cs/glue/pcmcia_glue.h \
@device_driver_group_pcmcia_TRUE@ linux/pcmcia-cs/modules/cs.c \
- @device_driver_group_pcmcia_TRUE@ linux/pcmcia-cs/modules/ds.c \
-@@ -622,40 +601,40 @@ DIST_COMMON = README $(am__configure_dep
+@@ -822,10 +801,10 @@ DIST_COMMON = README $(am__configure_dep
@device_driver_group_pcmcia_TRUE@ linux/pcmcia-cs/modules/cistpl.c \
@device_driver_group_pcmcia_TRUE@ linux/pcmcia-cs/modules/pci_fixup.c
--@device_driver_i82365_TRUE@am__append_95 = \
-+@device_driver_i82365_TRUE@am__append_96 = \
- @device_driver_i82365_TRUE@ linux/pcmcia-cs/modules/i82365.c
-
--@device_driver_3c574_cs_TRUE@am__append_96 = \
-+@device_driver_3c574_cs_TRUE@am__append_97 = \
+-@device_driver_group_pcmcia_TRUE@am__append_103 = \
++@device_driver_group_pcmcia_TRUE@am__append_104 = \
+ @device_driver_group_pcmcia_TRUE@ linux/pcmcia-cs/glue/ds.c
+
+-@device_driver_i82365_TRUE@am__append_104 = \
++@device_driver_i82365_TRUE@am__append_105 = \
+ @device_driver_i82365_TRUE@ linux/pcmcia-cs/modules/cirrus.h \
+ @device_driver_i82365_TRUE@ linux/pcmcia-cs/modules/ene.h \
+ @device_driver_i82365_TRUE@ linux/pcmcia-cs/modules/i82365.c \
+@@ -838,34 +817,34 @@ DIST_COMMON = README $(am__configure_dep
+ @device_driver_i82365_TRUE@ linux/pcmcia-cs/modules/vg468.h \
+ @device_driver_i82365_TRUE@ linux/pcmcia-cs/modules/yenta.h
+
+-@device_driver_3c574_cs_TRUE@am__append_105 = \
++@device_driver_3c574_cs_TRUE@am__append_106 = \
@device_driver_3c574_cs_TRUE@ linux/pcmcia-cs/clients/3c574_cs.c
--@device_driver_3c589_cs_TRUE@am__append_97 = \
-+@device_driver_3c589_cs_TRUE@am__append_98 = \
+-@device_driver_3c589_cs_TRUE@am__append_106 = \
++@device_driver_3c589_cs_TRUE@am__append_107 = \
@device_driver_3c589_cs_TRUE@ linux/pcmcia-cs/clients/3c589_cs.c
--@device_driver_axnet_cs_TRUE@am__append_98 = \
-+@device_driver_axnet_cs_TRUE@am__append_99 = \
+-@device_driver_axnet_cs_TRUE@am__append_107 = \
++@device_driver_axnet_cs_TRUE@am__append_108 = \
+ @device_driver_axnet_cs_TRUE@ linux/pcmcia-cs/clients/ax8390.h \
@device_driver_axnet_cs_TRUE@ linux/pcmcia-cs/clients/axnet_cs.c
--@device_driver_fmvj18x_cs_TRUE@am__append_99 = \
-+@device_driver_fmvj18x_cs_TRUE@am__append_100 = \
+-@device_driver_fmvj18x_cs_TRUE@am__append_108 = \
++@device_driver_fmvj18x_cs_TRUE@am__append_109 = \
@device_driver_fmvj18x_cs_TRUE@ linux/pcmcia-cs/clients/fmvj18x_cs.c
--@device_driver_nmclan_cs_TRUE@am__append_100 = \
-+@device_driver_nmclan_cs_TRUE@am__append_101 = \
+-@device_driver_nmclan_cs_TRUE@am__append_109 = \
++@device_driver_nmclan_cs_TRUE@am__append_110 = \
@device_driver_nmclan_cs_TRUE@ linux/pcmcia-cs/clients/nmclan_cs.c
--@device_driver_pcnet_cs_TRUE@am__append_101 = \
-+@device_driver_pcnet_cs_TRUE@am__append_102 = \
+-@device_driver_pcnet_cs_TRUE@am__append_110 = \
++@device_driver_pcnet_cs_TRUE@am__append_111 = \
@device_driver_pcnet_cs_TRUE@ linux/pcmcia-cs/clients/pcnet_cs.c \
@device_driver_pcnet_cs_TRUE@ linux/src/drivers/net/8390.c
--@device_driver_smc91c92_cs_TRUE@am__append_102 = \
-+@device_driver_smc91c92_cs_TRUE@am__append_103 = \
+-@device_driver_smc91c92_cs_TRUE@am__append_111 = \
++@device_driver_smc91c92_cs_TRUE@am__append_112 = \
+ @device_driver_smc91c92_cs_TRUE@ linux/pcmcia-cs/clients/ositech.h \
@device_driver_smc91c92_cs_TRUE@ linux/pcmcia-cs/clients/smc91c92_cs.c
--@device_driver_xirc2ps_cs_TRUE@am__append_103 = \
-+@device_driver_xirc2ps_cs_TRUE@am__append_104 = \
+-@device_driver_xirc2ps_cs_TRUE@am__append_112 = \
++@device_driver_xirc2ps_cs_TRUE@am__append_113 = \
@device_driver_xirc2ps_cs_TRUE@ linux/pcmcia-cs/clients/xirc2ps_cs.c
--@device_driver_orinoco_cs_TRUE@am__append_104 = \
-+@device_driver_orinoco_cs_TRUE@am__append_105 = \
+-@device_driver_orinoco_cs_TRUE@am__append_113 = \
++@device_driver_orinoco_cs_TRUE@am__append_114 = \
+ @device_driver_orinoco_cs_TRUE@ linux/pcmcia-cs/glue/wireless_glue.h \
@device_driver_orinoco_cs_TRUE@ linux/pcmcia-cs/wireless/hermes.c \
- @device_driver_orinoco_cs_TRUE@ linux/pcmcia-cs/wireless/orinoco.c \
+ @device_driver_orinoco_cs_TRUE@ linux/pcmcia-cs/wireless/hermes.h \
+@@ -875,7 +854,7 @@ DIST_COMMON = README $(am__configure_dep
+ @device_driver_orinoco_cs_TRUE@ linux/pcmcia-cs/wireless/orinoco.h \
@device_driver_orinoco_cs_TRUE@ linux/pcmcia-cs/wireless/orinoco_cs.c
--@HOST_i386_TRUE@am__append_105 = \
-+@HOST_i386_TRUE@am__append_106 = \
+-@HOST_i386_TRUE@am__append_114 = \
++@HOST_i386_TRUE@am__append_115 = \
+ @HOST_i386_TRUE@ i386/linux/dev/include/linux/autoconf.h \
+ @HOST_i386_TRUE@ i386/linux/dev/include/linux_emul.h \
@HOST_i386_TRUE@ linux/src/arch/i386/lib/semaphore.S
-
- exec_boot_PROGRAMS = gnumach$(EXEEXT)
-@@ -721,31 +700,32 @@ am__libkernel_a_SOURCES_DIST = ddb/db_ac
- kern/boot_script.c util/putchar.c util/puts.c vm/vm_debug.c \
- vm/vm_external.c vm/vm_fault.c vm/vm_init.c vm/vm_kern.c \
- vm/vm_map.c vm/vm_object.c vm/vm_pageout.c vm/vm_resident.c \
-- vm/vm_user.c vm/memory_object.c device/cons.c \
-- device/dev_lookup.c device/dev_name.c device/dev_pager.c \
-- device/device_init.c device/ds_routines.c device/subrs.c \
-- device/net_io.c device/blkio.c device/chario.c device/kmsg.c \
-- version.c i386/i386at/autoconf.c i386/i386at/boothdr.S \
-- i386/i386at/com.c i386/i386at/conf.c i386/i386at/cons_conf.c \
-- i386/i386at/rtc.c i386/i386at/i386at_ds_routines.c \
-- i386/i386at/immc.c i386/i386at/int_init.c \
-- i386/i386at/interrupt.S i386/i386at/iopl.c i386/i386at/kd.c \
-- i386/i386at/kdasm.S i386/i386at/kd_event.c \
-- i386/i386at/kd_mouse.c i386/i386at/kd_queue.c \
-- i386/i386at/model_dep.c i386/i386at/pic_isa.c \
-- i386/i386at/lpr.c i386/i386/ast_check.c i386/i386/cswitch.S \
-- i386/i386/db_disasm.c i386/i386/db_interface.c \
-- i386/i386/db_trace.c i386/i386/debug_i386.c \
-- i386/i386/debug_trace.S i386/i386/fpe_linkage.c \
-- i386/i386/fpu.c i386/i386/gdt.c i386/i386/hardclock.c \
-- i386/i386/idt.c i386/i386/idt_inittab.S i386/i386/io_emulate.c \
-- i386/i386/io_map.c i386/i386/iopb.c i386/i386/ktss.c \
-- i386/i386/kttd_interface.c i386/i386/ldt.c i386/i386/locore.S \
-- i386/i386/loose_ends.c i386/i386/mp_desc.c i386/i386/pcb.c \
-- i386/i386/phys.c i386/i386/pic.c i386/i386/pit.c \
-- i386/i386/seg.c i386/i386/spl.S i386/i386/trap.c \
-- i386/i386/user_ldt.c i386/i386/_setjmp.S i386/intel/pmap.c \
-- i386/intel/read_fault.c chips/busses.c device/cirbuf.c
-+ vm/vm_user.c vm/memory_object_proxy.c vm/memory_object.c \
-+ device/cons.c device/dev_lookup.c device/dev_name.c \
-+ device/dev_pager.c device/device_init.c device/ds_routines.c \
-+ device/subrs.c device/net_io.c device/blkio.c device/chario.c \
-+ device/kmsg.c version.c i386/i386at/autoconf.c \
-+ i386/i386at/boothdr.S i386/i386at/com.c i386/i386at/conf.c \
-+ i386/i386at/cons_conf.c i386/i386at/rtc.c \
-+ i386/i386at/i386at_ds_routines.c i386/i386at/immc.c \
-+ i386/i386at/int_init.c i386/i386at/interrupt.S \
-+ i386/i386at/iopl.c i386/i386at/kd.c i386/i386at/kdasm.S \
-+ i386/i386at/kd_event.c i386/i386at/kd_mouse.c \
-+ i386/i386at/kd_queue.c i386/i386at/model_dep.c \
-+ i386/i386at/pic_isa.c i386/i386at/lpr.c i386/i386/ast_check.c \
-+ i386/i386/cswitch.S i386/i386/db_disasm.c \
-+ i386/i386/db_interface.c i386/i386/db_trace.c \
-+ i386/i386/debug_i386.c i386/i386/debug_trace.S \
-+ i386/i386/fpe_linkage.c i386/i386/fpu.c i386/i386/gdt.c \
-+ i386/i386/hardclock.c i386/i386/idt.c i386/i386/idt_inittab.S \
-+ i386/i386/io_emulate.c i386/i386/io_map.c i386/i386/iopb.c \
-+ i386/i386/ktss.c i386/i386/kttd_interface.c i386/i386/ldt.c \
-+ i386/i386/locore.S i386/i386/loose_ends.c i386/i386/mp_desc.c \
-+ i386/i386/pcb.c i386/i386/phys.c i386/i386/pic.c \
-+ i386/i386/pit.c i386/i386/seg.c i386/i386/spl.S \
-+ i386/i386/trap.c i386/i386/user_ldt.c i386/i386/_setjmp.S \
-+ i386/intel/pmap.c i386/intel/read_fault.c chips/busses.c \
-+ device/cirbuf.c
- @enable_kdb_TRUE@am__objects_2 = ddb/db_access.$(OBJEXT) \
- @enable_kdb_TRUE@ ddb/db_aout.$(OBJEXT) ddb/db_break.$(OBJEXT) \
- @enable_kdb_TRUE@ ddb/db_command.$(OBJEXT) \
-@@ -855,14 +835,15 @@ am_libkernel_a_OBJECTS = $(am__objects_2
- vm/vm_kern.$(OBJEXT) vm/vm_map.$(OBJEXT) \
+@@ -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 \
+- util/putchar.c util/puts.c vm/memory_object.c \
+- vm/memory_object.h vm/pmap.h vm/vm_debug.c vm/vm_external.c \
+- vm/vm_external.h vm/vm_fault.c vm/vm_fault.h vm/vm_init.c \
+- vm/vm_kern.c vm/vm_kern.h vm/vm_map.c vm/vm_map.h \
++ util/putchar.c util/puts.c vm/memory_object_proxy.c \
++ vm/memory_object.c vm/memory_object.h vm/pmap.h vm/vm_debug.c \
++ vm/vm_external.c vm/vm_external.h vm/vm_fault.c vm/vm_fault.h \
++ vm/vm_init.c vm/vm_kern.c vm/vm_kern.h vm/vm_map.c vm/vm_map.h \
+ 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 \
+@@ -1124,9 +1103,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) \
+- vm/memory_object.$(OBJEXT) vm/vm_debug.$(OBJEXT) \
+- vm/vm_external.$(OBJEXT) vm/vm_fault.$(OBJEXT) \
+- vm/vm_init.$(OBJEXT) vm/vm_kern.$(OBJEXT) vm/vm_map.$(OBJEXT) \
++ vm/memory_object_proxy.$(OBJEXT) vm/memory_object.$(OBJEXT) \
++ vm/vm_debug.$(OBJEXT) vm/vm_external.$(OBJEXT) \
++ vm/vm_fault.$(OBJEXT) vm/vm_init.$(OBJEXT) \
++ vm/vm_kern.$(OBJEXT) vm/vm_map.$(OBJEXT) \
vm/vm_object.$(OBJEXT) vm/vm_pageout.$(OBJEXT) \
vm/vm_resident.$(OBJEXT) vm/vm_user.$(OBJEXT) \
-- vm/memory_object.$(OBJEXT) device/cons.$(OBJEXT) \
-- device/dev_lookup.$(OBJEXT) device/dev_name.$(OBJEXT) \
-- device/dev_pager.$(OBJEXT) device/device_init.$(OBJEXT) \
-- device/ds_routines.$(OBJEXT) device/subrs.$(OBJEXT) \
-- device/net_io.$(OBJEXT) device/blkio.$(OBJEXT) \
-- device/chario.$(OBJEXT) $(am__objects_3) version.$(OBJEXT) \
-- $(am__objects_4) $(am__objects_5) $(am__objects_6) \
-- $(am__objects_7) $(am__objects_8)
-+ vm/memory_object_proxy.$(OBJEXT) vm/memory_object.$(OBJEXT) \
-+ device/cons.$(OBJEXT) device/dev_lookup.$(OBJEXT) \
-+ device/dev_name.$(OBJEXT) device/dev_pager.$(OBJEXT) \
-+ device/device_init.$(OBJEXT) device/ds_routines.$(OBJEXT) \
-+ device/subrs.$(OBJEXT) device/net_io.$(OBJEXT) \
-+ device/blkio.$(OBJEXT) device/chario.$(OBJEXT) \
-+ $(am__objects_3) version.$(OBJEXT) $(am__objects_4) \
-+ $(am__objects_5) $(am__objects_6) $(am__objects_7) \
-+ $(am__objects_8)
- @HOST_i386_TRUE@am__objects_9 = i386/i386/mach_i386.server.$(OBJEXT)
- nodist_libkernel_a_OBJECTS = vm/memory_object_user.user.$(OBJEXT) \
- vm/memory_object_default.user.$(OBJEXT) \
-@@ -950,7 +931,7 @@ am__liblinux_a_SOURCES_DIST = linux/dev/
- linux/src/drivers/net/pcnet32.c \
+ device/blkio.$(OBJEXT) device/chario.$(OBJEXT) \
+@@ -1271,7 +1251,8 @@ am__liblinux_a_SOURCES_DIST = linux/dev/
linux/src/drivers/net/rtl8139.c \
linux/src/drivers/net/seeq8005.c \
-- linux/src/drivers/net/sk_g16.c \
+ linux/src/drivers/net/seeq8005.h \
+- linux/src/drivers/net/sk_g16.c linux/src/drivers/net/sk_g16.h \
+ linux/src/drivers/net/sis900.c linux/src/drivers/net/sk_g16.c \
++ linux/src/drivers/net/sk_g16.h \
linux/src/drivers/net/smc-ultra.c \
linux/src/drivers/net/smc-ultra32.c \
linux/src/drivers/net/starfire.c \
-@@ -1057,23 +1038,24 @@ am__liblinux_a_SOURCES_DIST = linux/dev/
+@@ -1382,23 +1363,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)
@@ -786,7 +428,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) \
-@@ -1120,7 +1102,7 @@ am_liblinux_a_OBJECTS = linux/dev/init/l
+@@ -1445,7 +1427,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) \
@@ -795,8 +437,8 @@ Regenerate with:
liblinux_a_OBJECTS = $(am_liblinux_a_OBJECTS)
liblinux_pcmcia_cs_clients_a_AR = $(AR) $(ARFLAGS)
liblinux_pcmcia_cs_clients_a_LIBADD =
-@@ -1134,19 +1116,19 @@ am__liblinux_pcmcia_cs_clients_a_SOURCES
- linux/src/drivers/net/8390.c \
+@@ -1460,19 +1442,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
-@device_driver_3c574_cs_TRUE@am__objects_95 = linux/pcmcia-cs/clients/liblinux_pcmcia_cs_clients_a-3c574_cs.$(OBJEXT)
@@ -827,10 +469,10 @@ Regenerate with:
liblinux_pcmcia_cs_clients_a_OBJECTS = \
$(am_liblinux_pcmcia_cs_clients_a_OBJECTS)
liblinux_pcmcia_cs_modules_a_AR = $(AR) $(ARFLAGS)
-@@ -1159,16 +1141,16 @@ am__liblinux_pcmcia_cs_modules_a_SOURCES
- linux/pcmcia-cs/modules/cistpl.c \
- linux/pcmcia-cs/modules/pci_fixup.c \
- linux/pcmcia-cs/modules/i82365.c
+@@ -1497,16 +1479,16 @@ 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
-@device_driver_group_pcmcia_TRUE@am__objects_103 = linux/pcmcia-cs/glue/liblinux_pcmcia_cs_modules_a-pcmcia.$(OBJEXT) \
+@device_driver_group_pcmcia_TRUE@am__objects_104 = linux/pcmcia-cs/glue/liblinux_pcmcia_cs_modules_a-pcmcia.$(OBJEXT) \
@device_driver_group_pcmcia_TRUE@ linux/pcmcia-cs/modules/liblinux_pcmcia_cs_modules_a-cs.$(OBJEXT) \
@@ -848,9 +490,9 @@ Regenerate with:
liblinux_pcmcia_cs_modules_a_OBJECTS = \
$(am_liblinux_pcmcia_cs_modules_a_OBJECTS)
liblinux_pcmcia_cs_wireless_a_AR = $(AR) $(ARFLAGS)
-@@ -1177,10 +1159,10 @@ am__liblinux_pcmcia_cs_wireless_a_SOURCE
- linux/pcmcia-cs/wireless/hermes.c \
+@@ -1520,10 +1502,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
-@device_driver_orinoco_cs_TRUE@am__objects_105 = linux/pcmcia-cs/wireless/liblinux_pcmcia_cs_wireless_a-hermes.$(OBJEXT) \
+@device_driver_orinoco_cs_TRUE@am__objects_106 = linux/pcmcia-cs/wireless/liblinux_pcmcia_cs_wireless_a-hermes.$(OBJEXT) \
@@ -861,7 +503,7 @@ Regenerate with:
liblinux_pcmcia_cs_wireless_a_OBJECTS = \
$(am_liblinux_pcmcia_cs_wireless_a_OBJECTS)
am__installdirs = "$(DESTDIR)$(exec_bootdir)" "$(DESTDIR)$(infodir)" \
-@@ -1219,14 +1201,13 @@ DIST_SOURCES = $(am__libkernel_a_SOURCES
+@@ -1561,14 +1543,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)
@@ -881,7 +523,33 @@ Regenerate with:
TEXI2DVI = texi2dvi
TEXI2PDF = $(TEXI2DVI) --pdf --batch
MAKEINFOHTML = $(MAKEINFO) --html
-@@ -1408,7 +1389,7 @@ noinst_LIBRARIES = libkernel.a lib_dep_t
+@@ -1847,6 +1828,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@
++device_driver_sis900_FALSE = @device_driver_sis900_FALSE@
++device_driver_sis900_TRUE = @device_driver_sis900_TRUE@
+ 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@
+@@ -1942,12 +1925,11 @@ EXTRA_DIST = gensym.awk ipc/mach_port.sr
+ vm/memory_object_default.cli vm/memory_object_user.cli \
+ device/device.srv device/device_pager.srv \
+ device/device_reply.cli device/memory_object_reply.cli include \
+- $(am__append_7) $(mach_TEXINFOS) $(am__append_18) \
+- $(am__append_25) $(am__append_29) $(am__append_31) \
+- $(am__append_35) $(am__append_45) \
+- linux/src/drivers/scsi/NCR5380.c \
++ $(am__append_7) $(am__append_18) $(am__append_25) \
++ $(am__append_29) $(am__append_31) $(am__append_35) \
++ $(am__append_45) linux/src/drivers/scsi/NCR5380.c \
+ linux/src/drivers/scsi/NCR5380.h linux/src/drivers/net/8390.h \
+- linux/src/drivers/net/kern_compat.h $(am__append_103) \
++ linux/src/drivers/net/kern_compat.h $(am__append_104) \
+ linux/dev/README linux/src/COPYING linux/dev/include \
+ linux/src/include linux/pcmcia-cs/include \
+ Makefile.correct_output_files_for_.S_files.patch \
+@@ -1975,7 +1957,7 @@ noinst_LIBRARIES = libkernel.a lib_dep_t
liblinux_pcmcia_cs_modules.a liblinux_pcmcia_cs_clients.a \
liblinux_pcmcia_cs_wireless.a
TESTS = tests/test-mbchk
@@ -890,79 +558,80 @@ Regenerate with:
# kern/mach.server.defs
# kern/mach4.server.defs
# kern/mach_debug.server.defs
-@@ -1479,12 +1460,12 @@ libkernel_a_SOURCES = $(am__append_1) ip
- kern/boot_script.c util/putchar.c util/puts.c vm/vm_debug.c \
- vm/vm_external.c vm/vm_fault.c vm/vm_init.c vm/vm_kern.c \
- vm/vm_map.c vm/vm_object.c vm/vm_pageout.c vm/vm_resident.c \
-- vm/vm_user.c vm/memory_object.c device/cons.c \
-- device/dev_lookup.c device/dev_name.c device/dev_pager.c \
-- device/device_init.c device/ds_routines.c device/subrs.c \
-- device/net_io.c device/blkio.c device/chario.c $(am__append_2) \
-- version.c $(am__append_3) $(am__append_4) $(am__append_5) \
-- $(am__append_6) $(am__append_7)
-+ vm/vm_user.c vm/memory_object_proxy.c vm/memory_object.c \
-+ device/cons.c device/dev_lookup.c device/dev_name.c \
-+ device/dev_pager.c device/device_init.c device/ds_routines.c \
-+ device/subrs.c device/net_io.c device/blkio.c device/chario.c \
-+ $(am__append_2) version.c $(am__append_3) $(am__append_4) \
-+ $(am__append_5) $(am__append_6) $(am__append_7)
- nodist_libkernel_a_SOURCES = vm/memory_object_user.user.h \
- vm/memory_object_user.user.c vm/memory_object_default.user.h \
- vm/memory_object_default.user.c device/device_reply.user.h \
-@@ -1642,9 +1623,6 @@ exec_msgids_DATA = gnumach.msgids
+@@ -2072,10 +2054,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 \
+- util/putchar.c util/puts.c vm/memory_object.c \
+- vm/memory_object.h vm/pmap.h vm/vm_debug.c vm/vm_external.c \
+- vm/vm_external.h vm/vm_fault.c vm/vm_fault.h vm/vm_init.c \
+- vm/vm_kern.c vm/vm_kern.h vm/vm_map.c vm/vm_map.h \
++ util/putchar.c util/puts.c vm/memory_object_proxy.c \
++ vm/memory_object.c vm/memory_object.h vm/pmap.h vm/vm_debug.c \
++ vm/vm_external.c vm/vm_external.h vm/vm_fault.c vm/vm_fault.h \
++ vm/vm_init.c vm/vm_kern.c vm/vm_kern.h vm/vm_map.c vm/vm_map.h \
+ 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 \
+@@ -2245,14 +2227,6 @@ exec_msgids_DATA = gnumach.msgids
@HOST_i386_TRUE@ i386/include/mach/i386/vm_param.h \
@HOST_i386_TRUE@ i386/include/mach/i386/vm_types.h
-mach_TEXINFOS = \
- doc/fdl.texi doc/gpl.texi
-
+-
+-#
+-# Web pages of the GNU Mach Reference Manual.
+-#
+-web = doc/web
liblinux_a_CPPFLAGS = $(AM_CPPFLAGS) \
-I$(srcdir)/$(systype)/linux/dev/include \
-I$(top_builddir)/linux/dev/include \
-@@ -1697,7 +1675,8 @@ liblinux_a_SOURCES = linux/dev/init/vers
- $(am__append_83) $(am__append_84) $(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) $(am__append_105)
-+ $(am__append_92) $(am__append_93) $(am__append_94) \
-+ $(am__append_106)
+@@ -2305,7 +2279,8 @@ liblinux_a_SOURCES = linux/dev/init/vers
+ $(am__append_91) $(am__append_92) $(am__append_93) \
+ $(am__append_94) $(am__append_95) $(am__append_96) \
+ $(am__append_97) $(am__append_98) $(am__append_99) \
+- $(am__append_100) $(am__append_101) $(am__append_114)
++ $(am__append_100) $(am__append_101) $(am__append_102) \
++ $(am__append_115)
# pcmcia-cs.
liblinux_pcmcia_cs_modules_a_CPPFLAGS = $(liblinux_a_CPPFLAGS) \
-@@ -1706,25 +1685,25 @@ liblinux_pcmcia_cs_modules_a_CPPFLAGS =
+@@ -2314,25 +2289,25 @@ liblinux_pcmcia_cs_modules_a_CPPFLAGS =
liblinux_pcmcia_cs_modules_a_CFLAGS = $(liblinux_a_CFLAGS) \
-include $(srcdir)/linux/pcmcia-cs/glue/pcmcia_glue.h
--liblinux_pcmcia_cs_modules_a_SOURCES = $(am__append_94) \
-- $(am__append_95)
-+liblinux_pcmcia_cs_modules_a_SOURCES = $(am__append_95) \
-+ $(am__append_96)
+-liblinux_pcmcia_cs_modules_a_SOURCES = $(am__append_102) \
+- $(am__append_104)
++liblinux_pcmcia_cs_modules_a_SOURCES = $(am__append_103) \
++ $(am__append_105)
liblinux_pcmcia_cs_clients_a_CPPFLAGS = $(liblinux_a_CPPFLAGS) \
-DPCMCIA_CLIENT -I$(srcdir)/linux/pcmcia-cs/include
liblinux_pcmcia_cs_clients_a_CFLAGS = $(liblinux_a_CFLAGS) \
-include $(srcdir)/linux/pcmcia-cs/glue/pcmcia_glue.h
--liblinux_pcmcia_cs_clients_a_SOURCES = $(am__append_96) \
-- $(am__append_97) $(am__append_98) $(am__append_99) \
-- $(am__append_100) $(am__append_101) $(am__append_102) \
-- $(am__append_103)
-+liblinux_pcmcia_cs_clients_a_SOURCES = $(am__append_97) \
-+ $(am__append_98) $(am__append_99) $(am__append_100) \
-+ $(am__append_101) $(am__append_102) $(am__append_103) \
-+ $(am__append_104)
+-liblinux_pcmcia_cs_clients_a_SOURCES = $(am__append_105) \
+- $(am__append_106) $(am__append_107) $(am__append_108) \
+- $(am__append_109) $(am__append_110) $(am__append_111) \
+- $(am__append_112)
++liblinux_pcmcia_cs_clients_a_SOURCES = $(am__append_106) \
++ $(am__append_107) $(am__append_108) $(am__append_109) \
++ $(am__append_110) $(am__append_111) $(am__append_112) \
++ $(am__append_113)
liblinux_pcmcia_cs_wireless_a_CPPFLAGS = $(liblinux_a_CPPFLAGS) \
-I$(srcdir)/linux/pcmcia-cs/include
liblinux_pcmcia_cs_wireless_a_CFLAGS = $(liblinux_a_CFLAGS) \
-include $(srcdir)/linux/pcmcia-cs/glue/wireless_glue.h
--liblinux_pcmcia_cs_wireless_a_SOURCES = $(am__append_104)
-+liblinux_pcmcia_cs_wireless_a_SOURCES = $(am__append_105)
+-liblinux_pcmcia_cs_wireless_a_SOURCES = $(am__append_113)
++liblinux_pcmcia_cs_wireless_a_SOURCES = $(am__append_114)
# Makerules: how to do some things.
-@@ -1733,6 +1712,7 @@ liblinux_pcmcia_cs_wireless_a_SOURCES =
+@@ -2341,6 +2316,7 @@ liblinux_pcmcia_cs_wireless_a_SOURCES =
# Test suite.
# Documentation.
@@ -970,20 +639,7 @@ Regenerate with:
# Linux device drivers and the glue code.
-@@ -1748,9 +1728,9 @@ gnumach_o_SOURCES =
- gnumach_o_LINK = $(LD) -u _start -r -o $@ --start-group
-
- # This is the list of routines we decide is OK to steal from the C library.
--clib_routines := memcpy memmove memset bcopy bzero \
-- strchr strstr strsep strpbrk strtok \
-- htonl htons ntohl ntohs \
-+clib_routines := memcpy memmove memset bcopy bzero \
-+ strchr strstr strsep strpbrk strtok \
-+ htonl htons ntohl ntohs \
- etext edata end # actually ld magic, not libc.
-
- gnumach_SOURCES =
-@@ -1770,7 +1750,7 @@ all: config.h
+@@ -2378,7 +2354,7 @@ all: config.h
.SUFFIXES: .S .c .dvi .o .obj .ps
am--refresh:
@:
@@ -992,16 +648,16 @@ Regenerate with:
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
-@@ -2074,6 +2054,8 @@ vm/vm_pageout.$(OBJEXT): vm/$(am__dirsta
- vm/vm_resident.$(OBJEXT): vm/$(am__dirstamp) \
- vm/$(DEPDIR)/$(am__dirstamp)
- vm/vm_user.$(OBJEXT): vm/$(am__dirstamp) vm/$(DEPDIR)/$(am__dirstamp)
+@@ -2668,6 +2644,8 @@ util/putchar.$(OBJEXT): util/$(am__dirst
+ util/$(DEPDIR)/$(am__dirstamp)
+ util/puts.$(OBJEXT): util/$(am__dirstamp) \
+ util/$(DEPDIR)/$(am__dirstamp)
+vm/memory_object_proxy.$(OBJEXT): vm/$(am__dirstamp) \
+ vm/$(DEPDIR)/$(am__dirstamp)
vm/memory_object.$(OBJEXT): vm/$(am__dirstamp) \
vm/$(DEPDIR)/$(am__dirstamp)
- device/cons.$(OBJEXT): device/$(am__dirstamp) \
-@@ -2672,6 +2654,9 @@ linux/src/drivers/net/liblinux_a-rtl8139
+ vm/vm_debug.$(OBJEXT): vm/$(am__dirstamp) vm/$(DEPDIR)/$(am__dirstamp)
+@@ -3278,6 +3256,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)
@@ -1011,7 +667,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)
-@@ -3105,6 +3090,7 @@ mostlyclean-compile:
+@@ -3710,6 +3691,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)
@@ -1019,7 +675,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)
-@@ -3163,6 +3149,7 @@ mostlyclean-compile:
+@@ -3768,6 +3750,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)
@@ -1027,7 +683,7 @@ Regenerate with:
-rm -f vm/memory_object_user.user.$(OBJEXT)
-rm -f vm/vm_debug.$(OBJEXT)
-rm -f vm/vm_external.$(OBJEXT)
-@@ -3435,6 +3422,7 @@ distclean-compile:
+@@ -4029,6 +4012,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@
@@ -1035,7 +691,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@
-@@ -3493,6 +3481,7 @@ distclean-compile:
+@@ -4087,6 +4071,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@
@@ -1043,33 +699,33 @@ 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@
-@@ -5231,6 +5220,20 @@ linux/src/drivers/net/liblinux_a-seeq800
+@@ -5807,6 +5792,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`
+linux/src/drivers/net/liblinux_a-sis900.o: linux/src/drivers/net/sis900.c
-+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblinux_a_CPPFLAGS) $(CPPFLAGS) $(liblinux_a_CFLAGS) $(CFLAGS) -MT linux/src/drivers/net/liblinux_a-sis900.o -MD -MP -MF linux/src/drivers/net/$(DEPDIR)/liblinux_a-sis900.Tpo -c -o linux/src/drivers/net/liblinux_a-sis900.o `test -f 'linux/src/drivers/net/sis900.c' || echo '$(srcdir)/'`linux/src/drivers/net/sis900.c
-+@am__fastdepCC_TRUE@ mv -f linux/src/drivers/net/$(DEPDIR)/liblinux_a-sis900.Tpo linux/src/drivers/net/$(DEPDIR)/liblinux_a-sis900.Po
++@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblinux_a_CPPFLAGS) $(CPPFLAGS) $(liblinux_a_CFLAGS) $(CFLAGS) -MT linux/src/drivers/net/liblinux_a-sis900.o -MD -MP -MF "linux/src/drivers/net/$(DEPDIR)/liblinux_a-sis900.Tpo" -c -o linux/src/drivers/net/liblinux_a-sis900.o `test -f 'linux/src/drivers/net/sis900.c' || echo '$(srcdir)/'`linux/src/drivers/net/sis900.c; \
++@am__fastdepCC_TRUE@ then mv -f "linux/src/drivers/net/$(DEPDIR)/liblinux_a-sis900.Tpo" "linux/src/drivers/net/$(DEPDIR)/liblinux_a-sis900.Po"; else rm -f "linux/src/drivers/net/$(DEPDIR)/liblinux_a-sis900.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='linux/src/drivers/net/sis900.c' object='linux/src/drivers/net/liblinux_a-sis900.o' libtool=no @AMDEPBACKSLASH@
+@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-sis900.o `test -f 'linux/src/drivers/net/sis900.c' || echo '$(srcdir)/'`linux/src/drivers/net/sis900.c
+
+linux/src/drivers/net/liblinux_a-sis900.obj: linux/src/drivers/net/sis900.c
-+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblinux_a_CPPFLAGS) $(CPPFLAGS) $(liblinux_a_CFLAGS) $(CFLAGS) -MT linux/src/drivers/net/liblinux_a-sis900.obj -MD -MP -MF linux/src/drivers/net/$(DEPDIR)/liblinux_a-sis900.Tpo -c -o linux/src/drivers/net/liblinux_a-sis900.obj `if test -f 'linux/src/drivers/net/sis900.c'; then $(CYGPATH_W) 'linux/src/drivers/net/sis900.c'; else $(CYGPATH_W) '$(srcdir)/linux/src/drivers/net/sis900.c'; fi`
-+@am__fastdepCC_TRUE@ mv -f linux/src/drivers/net/$(DEPDIR)/liblinux_a-sis900.Tpo linux/src/drivers/net/$(DEPDIR)/liblinux_a-sis900.Po
++@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblinux_a_CPPFLAGS) $(CPPFLAGS) $(liblinux_a_CFLAGS) $(CFLAGS) -MT linux/src/drivers/net/liblinux_a-sis900.obj -MD -MP -MF "linux/src/drivers/net/$(DEPDIR)/liblinux_a-sis900.Tpo" -c -o linux/src/drivers/net/liblinux_a-sis900.obj `if test -f 'linux/src/drivers/net/sis900.c'; then $(CYGPATH_W) 'linux/src/drivers/net/sis900.c'; else $(CYGPATH_W) '$(srcdir)/linux/src/drivers/net/sis900.c'; fi`; \
++@am__fastdepCC_TRUE@ then mv -f "linux/src/drivers/net/$(DEPDIR)/liblinux_a-sis900.Tpo" "linux/src/drivers/net/$(DEPDIR)/liblinux_a-sis900.Po"; else rm -f "linux/src/drivers/net/$(DEPDIR)/liblinux_a-sis900.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='linux/src/drivers/net/sis900.c' object='linux/src/drivers/net/liblinux_a-sis900.obj' libtool=no @AMDEPBACKSLASH@
+@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-sis900.obj `if test -f 'linux/src/drivers/net/sis900.c'; then $(CYGPATH_W) 'linux/src/drivers/net/sis900.c'; else $(CYGPATH_W) '$(srcdir)/linux/src/drivers/net/sis900.c'; fi`
+
linux/src/drivers/net/liblinux_a-sk_g16.o: linux/src/drivers/net/sk_g16.c
- @am__fastdepCC_TRUE@ $(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@ mv -f linux/src/drivers/net/$(DEPDIR)/liblinux_a-sk_g16.Tpo linux/src/drivers/net/$(DEPDIR)/liblinux_a-sk_g16.Po
-@@ -5692,75 +5695,6 @@ linux/pcmcia-cs/wireless/liblinux_pcmcia
+ @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
+@@ -6268,74 +6267,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`
-doc/$(am__dirstamp):
-- @$(MKDIR_P) doc
+- @$(mkdir_p) doc
- @: > doc/$(am__dirstamp)
-
-$(srcdir)/doc/mach.info: doc/mach.texi $(srcdir)/doc/version.texi
@@ -1117,9 +773,8 @@ Regenerate with:
- rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
- exit 1; \
- fi
--$(srcdir)/doc/version.texi: $(srcdir)/doc/stamp-vti
-$(srcdir)/doc/stamp-vti: doc/mach.texi $(top_srcdir)/configure
-- test -f doc/$(am__dirstamp) || $(MAKE) $(AM_MAKEFLAGS) doc/$(am__dirstamp)
+- test -f doc/$(am__dirstamp) || $(MAKE) doc/$(am__dirstamp)
- @(dir=.; test -f ./doc/mach.texi || dir=$(srcdir); \
- set `$(SHELL) $(top_srcdir)/build-aux/mdate-sh $$dir/doc/mach.texi`; \
- echo "@set UPDATED $$1 $$2 $$3"; \
@@ -1140,7 +795,7 @@ Regenerate with:
.dvi.ps:
TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
$(DVIPS) -o $@ $<
-@@ -5839,9 +5773,7 @@ dist-info: $(INFO_DEPS)
+@@ -6381,9 +6312,7 @@ dist-info: $(INFO_DEPS)
done
mostlyclean-aminfo:
@@ -1151,7 +806,16 @@ Regenerate with:
maintainer-clean-aminfo:
@list='$(INFO_DEPS)'; for i in $$list; do \
-@@ -6321,7 +6253,6 @@ distclean-generic:
+@@ -6685,7 +6614,7 @@ check-TESTS: $(TESTS)
+ distdir: $(DISTFILES)
+ $(am__remove_distdir)
+ mkdir $(distdir)
+- $(mkdir_p) $(distdir)/. $(distdir)/build-aux $(distdir)/device $(distdir)/doc $(distdir)/i386 $(distdir)/i386/i386 $(distdir)/i386/include/mach/i386 $(distdir)/i386/linux $(distdir)/include/device $(distdir)/include/mach $(distdir)/include/mach/exec $(distdir)/ipc $(distdir)/kern $(distdir)/linux $(distdir)/linux/dev $(distdir)/linux/pcmcia-cs $(distdir)/linux/pcmcia-cs/glue $(distdir)/linux/src $(distdir)/linux/src/drivers/net $(distdir)/linux/src/drivers/scsi $(distdir)/tests $(distdir)/vm
++ $(mkdir_p) $(distdir)/. $(distdir)/build-aux $(distdir)/device $(distdir)/i386 $(distdir)/i386/i386 $(distdir)/i386/include/mach/i386 $(distdir)/i386/linux $(distdir)/include/device $(distdir)/include/mach $(distdir)/include/mach/exec $(distdir)/ipc $(distdir)/kern $(distdir)/linux $(distdir)/linux/dev $(distdir)/linux/pcmcia-cs $(distdir)/linux/pcmcia-cs/glue $(distdir)/linux/src $(distdir)/linux/src/drivers/net $(distdir)/linux/src/drivers/scsi $(distdir)/tests $(distdir)/vm
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+@@ -6864,7 +6793,6 @@ distclean-generic:
-rm -f ddb/$(am__dirstamp)
-rm -f device/$(DEPDIR)/$(am__dirstamp)
-rm -f device/$(am__dirstamp)
@@ -1159,7 +823,16 @@ Regenerate with:
-rm -f i386/i386/$(DEPDIR)/$(am__dirstamp)
-rm -f i386/i386/$(am__dirstamp)
-rm -f i386/i386at/$(DEPDIR)/$(am__dirstamp)
-@@ -6505,12 +6436,12 @@ maintainer-clean: maintainer-clean-recur
+@@ -6942,7 +6870,7 @@ dvi-am: $(DVIS)
+
+ html: html-recursive
+
+-html-am: $(HTMLS) html-local
++html-am: $(HTMLS)
+
+ info: info-recursive
+
+@@ -6998,20 +6926,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 \
@@ -1174,24 +847,129 @@ Regenerate with:
pdf: pdf-recursive
-@@ -6548,9 +6479,8 @@ uninstall-am: uninstall-dvi-am uninstall
- install-man install-pdf install-pdf-am install-ps \
- install-ps-am install-strip installcheck installcheck-am \
+-pdf-am: $(PDFS) pdf-local
++pdf-am: $(PDFS)
+
+ ps: ps-recursive
+
+-ps-am: $(PSS) ps-local
++ps-am: $(PSS)
+
+ uninstall-am: uninstall-exec_bootPROGRAMS uninstall-exec_msgidsDATA \
+ uninstall-include_deviceHEADERS uninstall-include_machHEADERS \
+@@ -7028,19 +6956,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 \
+- html-am html-local info info-am install install-am \
+- install-data install-data-am install-data-hook install-exec \
+- install-exec-am install-exec_bootPROGRAMS \
+- install-exec_msgidsDATA install-include_deviceHEADERS \
+- install-include_machHEADERS install-include_mach_eXecHEADERS \
++ html-am info info-am install install-am install-data \
++ install-data-am install-data-hook install-exec install-exec-am \
++ install-exec_bootPROGRAMS install-exec_msgidsDATA \
++ install-include_deviceHEADERS install-include_machHEADERS \
++ install-include_mach_eXecHEADERS \
+ install-include_mach_i386HEADERS install-info install-info-am \
+ install-man install-strip installcheck installcheck-am \
installdirs installdirs-am maintainer-clean \
-- maintainer-clean-aminfo maintainer-clean-generic \
-- maintainer-clean-vti mostlyclean mostlyclean-aminfo \
-- mostlyclean-compile mostlyclean-generic mostlyclean-vti pdf \
-+ maintainer-clean-aminfo maintainer-clean-generic mostlyclean \
-+ mostlyclean-aminfo mostlyclean-compile mostlyclean-generic pdf \
- pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
- uninstall-dvi-am uninstall-exec_bootPROGRAMS \
- uninstall-exec_msgidsDATA uninstall-html-am \
-@@ -6690,7 +6620,7 @@ gnumach.msgids: $(nodist_lib_dep_tr_for_
+ maintainer-clean-aminfo maintainer-clean-generic \
+- maintainer-clean-recursive maintainer-clean-vti mostlyclean \
+- mostlyclean-aminfo mostlyclean-compile mostlyclean-generic \
+- mostlyclean-recursive mostlyclean-vti pdf pdf-am pdf-local ps \
+- ps-am ps-local tags tags-recursive uninstall uninstall-am \
++ maintainer-clean-recursive mostlyclean mostlyclean-aminfo \
++ mostlyclean-compile mostlyclean-generic mostlyclean-recursive \
++ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+ uninstall-exec_bootPROGRAMS uninstall-exec_msgidsDATA \
+ uninstall-include_deviceHEADERS uninstall-include_machHEADERS \
+ uninstall-include_mach_eXecHEADERS \
+@@ -7170,87 +7097,6 @@ gnumach.msgids: $(nodist_lib_dep_tr_for_
+ #
+ # Architecture specific parts.
#
- gnumach-undef: gnumach.$(OBJEXT)
- $(NM) -u $< | sed 's/ *U *//;s/^_*//' | sort -u > $@
--gnumach-undef-bad: gnumach-undef
-+gnumach-undef-bad: gnumach-undef Makefile
- sed '$(foreach r,$(clib_routines),/^$r$$/d;)' $< > $@
- clib-routines.o: gnumach-undef gnumach-undef-bad
- if test -s gnumach-undef-bad; \
+-
+-# Prepare a checkout in `$(web)/' of the web pages of the GNU Mach Reference
+-# Manual, using the same account that was used for the source code. Then
+-# install the potentially updated files into `$(web)/'.
+-.PHONY: $(web)
+-$(web):
+- if test -d $@/CVS; then :; else \
+- mkdir -p $@ $@/CVS && \
+- sed -e s%cvsroot%web% \
+- < $(top_srcdir)/CVS/Root \
+- > $@/CVS/Root && \
+- echo hurd/gnumach-doc \
+- > $@/CVS/Repository && \
+- : > $@/CVS/Entries; \
+- fi
+- cd $@/ && \
+- cvs update
+- $(MAKE) $(AM_MAKEFLAGS) \
+- html \
+- ps \
+- pdf
+-
+-# Update the files, if such a checkout exists.
+-html-local:
+- if test -d $(web); then \
+- ( cd $(web)/ && \
+- for f in *.html; do \
+- if test -f ../../$(HTMLS)/"$$f"; then :; else \
+- echo "\`$$f' isn't anymore. Removing." && \
+- rm "$$f" && \
+- cvs remove "$$f"; \
+- fi; \
+- done ) && \
+- cp $(HTMLS)/*.html $(web)/ && \
+- cd $(web)/ && \
+- { cvs add *.html || :; }; \
+- fi
+-ps-local:
+- if test -d $(web); then \
+- ( cd $(web)/ && \
+- for f in *.ps; do \
+- case \ $(PSS)\ in \
+- \ doc/"$$f"\ ) :;; \
+- *) echo "\`$$f' isn't anymore. Removing." && \
+- rm -f "$$f" "$$f".ps && \
+- cvs remove "$$f" "$$f".ps ;; \
+- esac; \
+- done ) && \
+- cp $(PSS) $(web)/ && \
+- cd $(web)/ && \
+- for f in *.ps; do \
+- gzip -9 < "$$f" > "$$f".gz; \
+- done && \
+- { cvs add *.ps *.ps.gz || :; }; \
+- fi
+-pdf-local:
+- if test -d $(web); then \
+- ( cd $(web)/ && \
+- for f in *.pdf; do \
+- case \ $(PDFS)\ in \
+- \ doc/"$$f"\ ) :;; \
+- *) echo "\`$$f' isn't anymore. Removing." && \
+- rm "$$f" && \
+- cvs remove "$$f";; \
+- esac; \
+- done ) && \
+- cp $(PDFS) $(web)/ && \
+- cd $(web)/ && \
+- { cvs add *.pdf || :; }; \
+- fi
+-# TODO. There doesn't seem to be a hook or `-local' target suitable for this.
+-$(srcdir)/doc/version.texi: $(srcdir)/doc/stamp-vti
+- @if test -d $(web); then :; \
+- elif grep -q :ext: $(top_srcdir)/CVS/Root 2> /dev/null; then \
+- echo "*** As it seems that you'd be allowed to check in the" \
+- "possible resulting fixes, you may cosider running" \
+- " \`make $(web)' to get a checkout of the web pages of the" \
+- "GNU Mach manual and have possible changes installed into" \
+- "\`$(web)/', ready for checking them in in there." && \
+- sleep 2; \
+- fi
+ dist-hook: dist-hook-linux
+ .PHONY: dist-hook-linux
+ dist-hook-linux:
diff --git a/debian/patches/series b/debian/patches/series
index 744d7bc..3e7819c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,7 +5,6 @@
13_ide_dma.patch -p0
14_alloc_params.patch -p0
15_mem_obj_proxy.patch -p0
-22_scsi_inf_loop.patch -p1
24_pci_irq_fix.patch -p1
41_io_unlock_ioremove.patch -p0
42_disable_ioperm.patch -p0
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-17 11:46:08 +0000