summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/20_mmx_support.patch93
-rw-r--r--debian/patches/41_io_unlock_ioremove.patch23
-rw-r--r--debian/patches/42_disable_ioperm.patch57
-rw-r--r--debian/patches/43_debvice_port_fix.patch58
-rw-r--r--debian/patches/44_more_ports.patch31
-rw-r--r--debian/patches/45_io_per_task.patch542
-rw-r--r--debian/patches/46_io_device.patch113
-rw-r--r--debian/patches/90_autoconf_autogen.patch151
-rw-r--r--debian/patches/series6
9 files changed, 110 insertions, 964 deletions
diff --git a/debian/patches/20_mmx_support.patch b/debian/patches/20_mmx_support.patch
index d9a4af9..8fb50f0 100644
--- a/debian/patches/20_mmx_support.patch
+++ b/debian/patches/20_mmx_support.patch
@@ -25,11 +25,8 @@
Index: i386/i386/fpu.c
===================================================================
-RCS file: /cvsroot/hurd/gnumach/i386/i386/fpu.c,v
-retrieving revision 1.2.4.10
-diff -u -p -r1.2.4.10 fpu.c
---- i386/i386/fpu.c 4 Jan 2007 23:51:02 -0000 1.2.4.10
-+++ i386/i386/fpu.c 3 Mar 2007 21:05:32 -0000
+--- i386/i386/fpu.c.orig 2007-05-25 03:17:38.000000000 +0300
++++ i386/i386/fpu.c 2007-05-26 09:18:12.000000000 +0300
@@ -43,6 +43,7 @@
#include <i386/thread.h>
#include <i386/fpu.h>
@@ -155,20 +152,22 @@ diff -u -p -r1.2.4.10 fpu.c
/*
* Set the floating-point state for a thread.
* If the thread is not the current thread, it is
-@@ -256,24 +340,43 @@ ASSERT_IPL(SPL0);
- pcb->ims.ifps = ifps;
- }
+@@ -261,16 +347,30 @@ ASSERT_IPL(SPL0);
+ */
+ memset(&ifps->fp_save_state, 0, sizeof(struct i386_fp_save));
-- /*
-- * Ensure that reserved parts of the environment are 0.
-- */
-- memset(&ifps->fp_save_state, 0, sizeof(struct i386_fp_save));
+- ifps->fp_save_state.fp_control = user_fp_state->fp_control;
+- ifps->fp_save_state.fp_status = user_fp_state->fp_status;
+- ifps->fp_save_state.fp_tag = user_fp_state->fp_tag;
+- ifps->fp_save_state.fp_eip = user_fp_state->fp_eip;
+- ifps->fp_save_state.fp_cs = user_fp_state->fp_cs;
+- ifps->fp_save_state.fp_opcode = user_fp_state->fp_opcode;
+- ifps->fp_save_state.fp_dp = user_fp_state->fp_dp;
+- ifps->fp_save_state.fp_ds = user_fp_state->fp_ds;
+- ifps->fp_regs = *user_fp_regs;
+- ifps->fp_valid = TRUE;
+ if (fp_kind == FP_387X) {
+ int i;
-+ /*
-+ * Ensure that reserved parts of the environment are 0.
-+ */
-+ memset(&ifps->xfp_save_state, 0, sizeof(struct i386_xfp_save));
+
+ ifps->xfp_save_state.fp_control = user_fp_state->fp_control;
+ ifps->xfp_save_state.fp_status = user_fp_state->fp_status;
@@ -181,20 +180,6 @@ diff -u -p -r1.2.4.10 fpu.c
+ for (i=0; i<8; i++)
+ memcpy(&ifps->xfp_save_state.fp_reg_word[i], &user_fp_regs[i], sizeof(user_fp_regs[i]));
+ } else {
-+ /*
-+ * Ensure that reserved parts of the environment are 0.
-+ */
-+ memset(&ifps->fp_save_state, 0, sizeof(struct i386_fp_save));
-
-- ifps->fp_save_state.fp_control = user_fp_state->fp_control;
-- ifps->fp_save_state.fp_status = user_fp_state->fp_status;
-- ifps->fp_save_state.fp_tag = user_fp_state->fp_tag;
-- ifps->fp_save_state.fp_eip = user_fp_state->fp_eip;
-- ifps->fp_save_state.fp_cs = user_fp_state->fp_cs;
-- ifps->fp_save_state.fp_opcode = user_fp_state->fp_opcode;
-- ifps->fp_save_state.fp_dp = user_fp_state->fp_dp;
-- ifps->fp_save_state.fp_ds = user_fp_state->fp_ds;
-- ifps->fp_regs = *user_fp_regs;
+ ifps->fp_save_state.fp_control = user_fp_state->fp_control;
+ ifps->fp_save_state.fp_status = user_fp_state->fp_status;
+ ifps->fp_save_state.fp_tag = user_fp_state->fp_tag;
@@ -208,12 +193,7 @@ diff -u -p -r1.2.4.10 fpu.c
simple_unlock(&pcb->lock);
if (new_ifps != 0)
-- zfree(ifps_zone, (vm_offset_t) ifps);
-+ zfree(ifps_zone, (vm_offset_t) new_ifps);
- }
-
- return KERN_SUCCESS;
-@@ -339,15 +442,29 @@ ASSERT_IPL(SPL0);
+@@ -340,15 +440,30 @@ ASSERT_IPL(SPL0);
*/
memset(user_fp_state, 0, sizeof(struct i386_fp_save));
@@ -227,7 +207,8 @@ diff -u -p -r1.2.4.10 fpu.c
- user_fp_state->fp_ds = ifps->fp_save_state.fp_ds;
- *user_fp_regs = ifps->fp_regs;
+ if (fp_kind == FP_387X) {
-+ int i;
++ int i;
++
+ user_fp_state->fp_control = ifps->xfp_save_state.fp_control;
+ user_fp_state->fp_status = ifps->xfp_save_state.fp_status;
+ user_fp_state->fp_tag = twd_fxsr_to_i387(&ifps->xfp_save_state);
@@ -252,7 +233,7 @@ diff -u -p -r1.2.4.10 fpu.c
}
simple_unlock(&pcb->lock);
-@@ -531,7 +648,9 @@ ASSERT_IPL(SPL0);
+@@ -532,7 +647,9 @@ ASSERT_IPL(SPL0);
*/
i386_exception(EXC_ARITHMETIC,
EXC_I386_EXTERR,
@@ -263,7 +244,7 @@ diff -u -p -r1.2.4.10 fpu.c
/*NOTREACHED*/
}
-@@ -553,7 +672,10 @@ fp_save(thread)
+@@ -554,7 +671,10 @@ fp_save(thread)
if (ifps != 0 && !ifps->fp_valid) {
/* registers are in FPU */
ifps->fp_valid = TRUE;
@@ -275,7 +256,7 @@ diff -u -p -r1.2.4.10 fpu.c
}
}
-@@ -594,14 +716,19 @@ ASSERT_IPL(SPL0);
+@@ -595,14 +715,19 @@ ASSERT_IPL(SPL0);
*/
i386_exception(EXC_ARITHMETIC,
EXC_I386_EXTERR,
@@ -297,7 +278,7 @@ diff -u -p -r1.2.4.10 fpu.c
}
ifps->fp_valid = FALSE; /* in FPU */
}
-@@ -623,11 +750,22 @@ fp_state_alloc()
+@@ -624,11 +749,22 @@ fp_state_alloc()
pcb->ims.ifps = ifps;
ifps->fp_valid = TRUE;
@@ -327,11 +308,8 @@ diff -u -p -r1.2.4.10 fpu.c
#if AT386
Index: i386/i386/fpu.h
===================================================================
-RCS file: /cvsroot/hurd/gnumach/i386/i386/fpu.h,v
-retrieving revision 1.1.1.1.4.3
-diff -u -p -r1.1.1.1.4.3 fpu.h
---- i386/i386/fpu.h 12 Dec 2006 23:30:49 -0000 1.1.1.1.4.3
-+++ i386/i386/fpu.h 3 Mar 2007 21:05:32 -0000
+--- i386/i386/fpu.h.orig 2007-02-11 14:51:12.000000000 +0200
++++ i386/i386/fpu.h 2007-05-26 09:08:36.000000000 +0300
@@ -66,6 +66,12 @@
#define frstor(state) \
asm volatile("frstor %0" : : "m" (state))
@@ -359,12 +337,9 @@ diff -u -p -r1.1.1.1.4.3 fpu.h
}
Index: i386/i386/thread.h
===================================================================
-RCS file: /cvsroot/hurd/gnumach/i386/i386/thread.h,v
-retrieving revision 1.3.2.1
-diff -u -p -r1.3.2.1 thread.h
---- i386/i386/thread.h 5 Nov 2006 20:39:24 -0000 1.3.2.1
-+++ i386/i386/thread.h 3 Mar 2007 21:05:32 -0000
-@@ -112,9 +112,14 @@ struct i386_kernel_state {
+--- i386/i386/thread.h.orig 2007-05-25 03:17:38.000000000 +0300
++++ i386/i386/thread.h 2007-05-26 09:08:36.000000000 +0300
+@@ -111,9 +111,14 @@ struct i386_kernel_state {
*/
struct i386_fpsave_state {
@@ -383,11 +358,8 @@ diff -u -p -r1.3.2.1 thread.h
/*
Index: i386/include/mach/i386/fp_reg.h
===================================================================
-RCS file: /cvsroot/hurd/gnumach/i386/include/mach/i386/fp_reg.h,v
-retrieving revision 1.1.1.1
-diff -u -p -r1.1.1.1 fp_reg.h
---- i386/include/mach/i386/fp_reg.h 25 Feb 1997 21:27:00 -0000 1.1.1.1
-+++ i386/include/mach/i386/fp_reg.h 3 Mar 2007 21:05:32 -0000
+--- i386/include/mach/i386/fp_reg.h.orig 1997-02-25 23:27:00.000000000 +0200
++++ i386/include/mach/i386/fp_reg.h 2007-05-26 09:08:36.000000000 +0300
@@ -46,10 +46,30 @@ struct i386_fp_save {
};
@@ -429,11 +401,8 @@ diff -u -p -r1.1.1.1 fp_reg.h
#endif /* _MACH_I386_FP_REG_H_ */
Index: i386/include/mach/i386/thread_status.h
===================================================================
-RCS file: /cvsroot/hurd/gnumach/i386/include/mach/i386/thread_status.h,v
-retrieving revision 1.1.1.1
-diff -u -p -r1.1.1.1 thread_status.h
---- i386/include/mach/i386/thread_status.h 25 Feb 1997 21:27:01 -0000 1.1.1.1
-+++ i386/include/mach/i386/thread_status.h 3 Mar 2007 21:05:32 -0000
+--- i386/include/mach/i386/thread_status.h.orig 1997-02-25 23:27:01.000000000 +0200
++++ i386/include/mach/i386/thread_status.h 2007-05-26 09:08:36.000000000 +0300
@@ -111,7 +111,7 @@ struct i386_thread_state {
(sizeof (struct i386_fp_save) + sizeof (struct i386_fp_regs))
diff --git a/debian/patches/41_io_unlock_ioremove.patch b/debian/patches/41_io_unlock_ioremove.patch
deleted file mode 100644
index 2631f81..0000000
--- a/debian/patches/41_io_unlock_ioremove.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-#DPATCHLEVEL=0
-
-2005-12-28 Samuel Thibault <samuel.thibault@ens-lyon.org>
-
- * i386/i386/iopb.c (i386_io_port_remove): Fix unlocking when io mapping
- is not found.
-
-
-Index: i386/i386/iopb.c
-===================================================================
---- i386/i386/iopb.c.orig 2006-11-14 03:58:56.000000000 +0200
-+++ i386/i386/iopb.c 2006-11-14 04:15:49.000000000 +0200
-@@ -471,6 +471,10 @@ i386_io_port_remove(thread, device)
- /*
- * No mapping.
- */
-+
-+ simple_unlock(&pcb->lock);
-+ simple_unlock(&iopb_lock);
-+
- return KERN_INVALID_ARGUMENT;
- }
-
diff --git a/debian/patches/42_disable_ioperm.patch b/debian/patches/42_disable_ioperm.patch
deleted file mode 100644
index 3ce74f3..0000000
--- a/debian/patches/42_disable_ioperm.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-#DPATCHLEVEL=0
-
-2001-10-07 Marcus Brinkmann <marcus@gnu.org>
-
- * i386/i386/iopb.c (iopb_create, i386_io_port_add): Disable io
- permissions by default.
-
-2004-11-16 Guillem Jover <guillem@hadrons.org>
-
- * i386/i386/ktss.c (ktss_init): Disable io permissions by default.
-
-
-Index: i386/i386/iopb.c
-===================================================================
---- i386/i386/iopb.c.orig 2006-11-14 04:15:49.000000000 +0200
-+++ i386/i386/iopb.c 2006-11-14 04:15:57.000000000 +0200
-@@ -273,7 +273,7 @@ iopb_create(void)
- register iopb_tss_t ts;
-
- ts = (iopb_tss_t) kalloc(sizeof (struct iopb_tss));
-- io_tss_init(ts, TRUE); /* XXX */
-+ io_tss_init(ts, FALSE);
- return ts;
- }
-
-@@ -360,7 +360,7 @@ i386_io_port_add(
- simple_unlock(&iopb_lock);
-
- new_io_tss = (iopb_tss_t) kalloc(sizeof(struct iopb_tss));
-- io_tss_init(new_io_tss, TRUE); /* XXX */
-+ io_tss_init(new_io_tss, FALSE);
-
- goto Retry;
- }
-Index: i386/i386/ktss.c
-===================================================================
---- i386/i386/ktss.c.orig 2006-11-14 03:58:56.000000000 +0200
-+++ i386/i386/ktss.c 2006-11-14 04:15:57.000000000 +0200
-@@ -44,7 +44,7 @@ ktss_init()
-
- /* Initialize the master TSS descriptor. */
- fill_gdt_descriptor(KERNEL_TSS,
-- kvtolin(&ktss), sizeof(ktss)+65536/8+1-1,
-+ kvtolin(&ktss), sizeof(ktss)-1,
- ACC_PL_K|ACC_TSS, 0);
-
- /* Initialize the master TSS. */
-@@ -52,9 +52,6 @@ ktss_init()
- ktss.esp0 = (unsigned)(exception_stack+1024);
- ktss.io_bit_map_offset = sizeof(ktss);
-
-- /* Set the last byte in the I/O bitmap to all 1's. */
-- ((unsigned char*)&ktss)[sizeof(ktss)+65536/8] = 0xff;
--
- /* Load the TSS. */
- ltr(KERNEL_TSS);
- }
diff --git a/debian/patches/43_debvice_port_fix.patch b/debian/patches/43_debvice_port_fix.patch
deleted file mode 100644
index 8c2e4e2..0000000
--- a/debian/patches/43_debvice_port_fix.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-#DPATCHLEVEL=1
-
-2006-01-02 Samuel Thibault <samuel.thibault@ens-lyon.org>
-
- * i386/i386/iopb.c (i386_io_port_add): Fix getting device parameter.
- (i386_io_port_remove): Same as above.
-
-
-Index: i386/i386/iopb.c
-===================================================================
---- i386/i386/iopb.c.orig 2006-11-14 04:15:57.000000000 +0200
-+++ i386/i386/iopb.c 2006-11-14 04:16:04.000000000 +0200
-@@ -310,12 +310,22 @@ iopb_destroy(
- /*
- * Add an IO mapping to a thread.
- */
-+#ifdef i386
-+kern_return_t
-+i386_io_port_add(
-+ thread_t thread,
-+ device_t d)
-+#else
- kern_return_t
- i386_io_port_add(
- thread_t thread,
- mach_device_t device)
-+#endif
- {
- pcb_t pcb;
-+#ifdef i386
-+ mach_device_t device = d->emul_data;
-+#endif
- iopb_tss_t io_tss, new_io_tss;
- io_port_t io_port;
- io_use_t iu, old_iu;
-@@ -409,12 +419,22 @@ i386_io_port_add(
- /*
- * Remove an IO mapping from a thread.
- */
-+#ifdef i386
-+kern_return_t
-+i386_io_port_remove(thread, d)
-+ thread_t thread;
-+ device_t d;
-+#else
- kern_return_t
- i386_io_port_remove(thread, device)
- thread_t thread;
- mach_device_t device;
-+#endif
- {
- pcb_t pcb;
-+#ifdef i386
-+ mach_device_t device = d->emul_data;
-+#endif
- iopb_tss_t io_tss;
- io_port_t io_port;
- io_use_t iu;
diff --git a/debian/patches/44_more_ports.patch b/debian/patches/44_more_ports.patch
deleted file mode 100644
index 44d4968..0000000
--- a/debian/patches/44_more_ports.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-2006-01-02 Samuel Thibault <samuel.thibault@ens-lyon.org>
-
- * i386/i386at/iopl.c (iopl_port_list): Add timer controler port.
- * i386/i386at/kd.c (vga_port_list): Renamed to ...
- (kd_port_list): ... this. Add timer and speaker ports.
-
-
-Index: i386/i386at/kd.c
-===================================================================
---- i386/i386at/kd.c.orig 2006-11-14 03:58:57.000000000 +0200
-+++ i386/i386at/kd.c 2006-11-14 04:16:08.000000000 +0200
-@@ -336,7 +336,9 @@ short kd_io_reg = EGA_IO_REG;
- /*
- * IO port sets for different controllers.
- */
--io_reg_t vga_port_list[] = {
-+static io_reg_t kd_port_list[] = {
-+ 0x42, 0x43, /* Timer */
-+ 0x61, /* Speaker */
- 0x3b4, 0x3b5, 0x3b8, 0x3b9, 0x3ba, /* MDA/EGA */
- 0x3d4, 0x3d5, 0x3d8, 0x3d9, 0x3da, /* CGA/EGA */
- 0x3c0, 0x3c1, 0x3c2, 0x3c3, 0x3c4, 0x3c5, 0x3c6, 0x3c7,
-@@ -351,7 +353,7 @@ kd_io_map_open(device)
- mach_device_t device;
- {
- kd_io_device = device;
-- io_port_create(device, vga_port_list);
-+ io_port_create(device, kd_port_list);
- }
-
- void
diff --git a/debian/patches/45_io_per_task.patch b/debian/patches/45_io_per_task.patch
deleted file mode 100644
index 9cc73df..0000000
--- a/debian/patches/45_io_per_task.patch
+++ /dev/null
@@ -1,542 +0,0 @@
-2006-01-02 Samuel Thibault <samuel.thibault@ens-lyon.org>
-
- * i386/i386/iopb.c: IO ports permissions are now task-based.
- (i386_io_port_add): Fix TSS access and locking accordingly.
- (i386_io_port_remove): Likewise.
- (i386_io_port_list): Likewise.
- (iopb_check_mapping): Likewise.
- * i386/i386/pcb.c (switch_ktss): Now takes next thread as parameter
- for TSS switch to be task-based. Fix all callers.
- (switch_context): Likewise.
- (pcb_module_init): Move iopb initialization to ...
- (machine_task_module_init): ... here. New function.
- (pcb_terminate): Move iopb termination to ...
- (machine_task_terminate): ... here. New function.
- (machine_task_init): New function.
- (machine_task_collect): Likewise.
- (thread_setstatus): TSS is now task-based, fix TSS and locking
- accordingly.
- (thread_getstatus): Likewise.
- * i386/i386/thread.h (i386_machine_state): Move io_tss member to ...
- (machine_task): ... here. New structure.
-
- * kern/task.c (task_init): Call new machine_task_module_init() function.
- (task_create): Call new machine_task_init() function.
- (task_deallocate): Call new machine_task_terminate() function.
- (task_collect_scan): Call new machine_task_collect() function.
- * kern/task.h: Include <machine/thread.h> for machine_task_t.
- (task): Add new machine member.
-
-
-Index: i386/i386/iopb.c
-===================================================================
---- i386/i386/iopb.c.orig 2007-04-05 07:31:23.000000000 +0300
-+++ i386/i386/iopb.c 2007-04-05 07:31:26.000000000 +0300
-@@ -67,8 +67,8 @@ queue_head_t device_to_io_port_list;
-
- /*
- * Cross-reference:
-- * all threads that have IO ports mapped
-- * all IO ports that have threads mapped
-+ * all tasks that have IO ports mapped
-+ * all IO ports that have tasks mapped
- */
- struct io_use {
- queue_chain_t psq; /* Links from port set */
-@@ -308,7 +308,7 @@ iopb_destroy(
- }
-
- /*
-- * Add an IO mapping to a thread.
-+ * Add an IO mapping to a task.
- */
- #ifdef i386
- kern_return_t
-@@ -322,7 +322,7 @@ i386_io_port_add(
- mach_device_t device)
- #endif
- {
-- pcb_t pcb;
-+ task_t task;
- #ifdef i386
- mach_device_t device = d->emul_data;
- #endif
-@@ -334,7 +334,7 @@ i386_io_port_add(
- || device == DEVICE_NULL)
- return KERN_INVALID_ARGUMENT;
-
-- pcb = thread->pcb;
-+ task = thread->task;
-
- new_io_tss = 0;
- iu = (io_use_t) kalloc(sizeof(struct io_use));
-@@ -357,16 +357,16 @@ i386_io_port_add(
-
- /* Have the IO port. */
-
-- /* Make sure the thread has a TSS. */
-+ /* Make sure the task has a TSS. */
-
-- simple_lock(&pcb->lock);
-- io_tss = pcb->ims.io_tss;
-+ task_lock(task);
-+ io_tss = task->machine.io_tss;
- if (io_tss == 0) {
- if (new_io_tss == 0) {
- /*
- * Allocate an IO-tss.
- */
-- simple_unlock(&pcb->lock);
-+ task_unlock(task);
- simple_unlock(&iopb_lock);
-
- new_io_tss = (iopb_tss_t) kalloc(sizeof(struct iopb_tss));
-@@ -375,7 +375,12 @@ i386_io_port_add(
- goto Retry;
- }
- io_tss = new_io_tss;
-- pcb->ims.io_tss = io_tss;
-+ task->machine.io_tss = io_tss;
-+
-+ /* Update hardware if needed. */
-+ if (task == current_thread()->task)
-+ switch_ktss(thread);
-+
- new_io_tss = 0;
- }
-
-@@ -388,7 +393,7 @@ i386_io_port_add(
- /*
- * Already mapped.
- */
-- simple_unlock(&pcb->lock);
-+ task_unlock(task);
- simple_unlock(&iopb_lock);
-
- kfree((vm_offset_t)iu, sizeof(struct io_use));
-@@ -407,7 +412,7 @@ i386_io_port_add(
- queue_enter(&io_tss->io_port_list, iu, io_use_t, tsq);
- io_bitmap_set(io_tss->bitmap, io_port->io_port_list);
-
-- simple_unlock(&pcb->lock);
-+ task_unlock(task);
- simple_unlock(&iopb_lock);
-
- if (new_io_tss)
-@@ -417,7 +422,7 @@ i386_io_port_add(
- }
-
- /*
-- * Remove an IO mapping from a thread.
-+ * Remove an IO mapping from a task.
- */
- #ifdef i386
- kern_return_t
-@@ -431,7 +436,7 @@ i386_io_port_remove(thread, device)
- mach_device_t device;
- #endif
- {
-- pcb_t pcb;
-+ task_t task;
- #ifdef i386
- mach_device_t device = d->emul_data;
- #endif
-@@ -443,7 +448,7 @@ i386_io_port_remove(thread, device)
- || device == DEVICE_NULL)
- return KERN_INVALID_ARGUMENT;
-
-- pcb = thread->pcb;
-+ task = thread->task;
-
- simple_lock(&iopb_lock);
-
-@@ -458,10 +463,10 @@ i386_io_port_remove(thread, device)
- return KERN_INVALID_ARGUMENT;
- }
-
-- simple_lock(&pcb->lock);
-- io_tss = pcb->ims.io_tss;
-+ task_lock(task);
-+ io_tss = task->machine.io_tss;
- if (io_tss == 0) {
-- simple_unlock(&pcb->lock);
-+ task_unlock(task);
- simple_unlock(&iopb_lock);
- return KERN_INVALID_ARGUMENT; /* not mapped */
- }
-@@ -479,7 +484,7 @@ i386_io_port_remove(thread, device)
- queue_remove(&io_port->io_use_list, iu, io_use_t, psq);
- queue_remove(&io_tss->io_port_list, iu, io_use_t, tsq);
-
-- simple_unlock(&pcb->lock);
-+ task_unlock(task);
- simple_unlock(&iopb_lock);
-
- kfree((vm_offset_t)iu, sizeof(struct io_use));
-@@ -488,6 +493,9 @@ i386_io_port_remove(thread, device)
- }
- }
-
-+ task_unlock(task);
-+ simple_unlock(&iopb_lock);
-+
- /*
- * No mapping.
- */
-@@ -499,7 +507,7 @@ i386_io_port_remove(thread, device)
- }
-
- /*
-- * Return the IO ports mapped into a thread.
-+ * Return the IO ports mapped into a task.
- */
- extern ipc_port_t mach_convert_device_to_port(/* device_t */);
-
-@@ -509,7 +517,7 @@ i386_io_port_list(thread, list, list_cou
- mach_device_t **list;
- unsigned int *list_count;
- {
-- register pcb_t pcb;
-+ task_t task;
- register iopb_tss_t io_tss;
- unsigned int count, alloc_count;
- mach_device_t *devices;
-@@ -520,7 +528,7 @@ i386_io_port_list(thread, list, list_cou
- if (thread == THREAD_NULL)
- return KERN_INVALID_ARGUMENT;
-
-- pcb = thread->pcb;
-+ task = thread->task;
-
- alloc_count = 16; /* a guess */
-
-@@ -543,8 +551,8 @@ i386_io_port_list(thread, list, list_cou
- count = 0;
-
- simple_lock(&iopb_lock);
-- simple_lock(&pcb->lock);
-- io_tss = pcb->ims.io_tss;
-+ task_lock(task);
-+ io_tss = task->machine.io_tss;
- if (io_tss != 0) {
- register io_use_t iu;
-
-@@ -556,7 +564,7 @@ i386_io_port_list(thread, list, list_cou
- }
- }
- }
-- simple_unlock(&pcb->lock);
-+ task_unlock(task);
- simple_unlock(&iopb_lock);
- } while (count > alloc_count);
-
-@@ -602,7 +610,7 @@ i386_io_port_list(thread, list, list_cou
- }
-
- /*
-- * Check whether an IO device is mapped to a particular thread.
-+ * Check whether an IO device is mapped to a particular task.
- * Used to support the 'iopl' device automatic mapping.
- */
- boolean_t
-@@ -610,11 +618,11 @@ iopb_check_mapping(thread, device)
- thread_t thread;
- mach_device_t device;
- {
-- pcb_t pcb;
-+ task_t task;
- io_port_t io_port;
- io_use_t iu;
-
-- pcb = thread->pcb;
-+ task = thread->task;
-
- simple_lock(&iopb_lock);
-
-@@ -628,15 +636,18 @@ iopb_check_mapping(thread, device)
-
- /* Look up the mapping in the device`s mapping list. */
-
-+ task_lock(task);
- queue_iterate(&io_port->io_use_list, iu, io_use_t, psq) {
-- if (iu->ts == pcb->ims.io_tss) {
-+ if (iu->ts == task->machine.io_tss) {
- /*
- * Device is mapped.
- */
-+ task_unlock(task);
- simple_unlock(&iopb_lock);
- return TRUE;
- }
- }
-+ task_unlock(task);
- simple_unlock(&iopb_lock);
- return FALSE;
- }
-Index: i386/i386/pcb.c
-===================================================================
---- i386/i386/pcb.c.orig 2007-02-11 14:51:13.000000000 +0200
-+++ i386/i386/pcb.c 2007-04-05 07:31:26.000000000 +0300
-@@ -132,12 +132,13 @@ vm_offset_t stack_detach(thread)
- #define gdt_desc_p(mycpu,sel) \
- ((struct real_descriptor *)&curr_gdt(mycpu)[sel_idx(sel)])
-
--void switch_ktss(pcb)
-- register pcb_t pcb;
-+void switch_ktss(thread)
-+ register thread_t thread;
- {
- int mycpu = cpu_number();
-+ register pcb_t pcb = thread->pcb;
- {
-- register iopb_tss_t tss = pcb->ims.io_tss;
-+ register iopb_tss_t tss = thread->task->machine.io_tss;
- vm_offset_t pcb_stack_top;
-
- /*
-@@ -242,7 +243,7 @@ void stack_handoff(old, new)
- /*
- * Load the rest of the user state for the new thread
- */
-- switch_ktss(new->pcb);
-+ switch_ktss(new);
-
- /*
- * Switch to new thread
-@@ -267,7 +268,7 @@ void stack_handoff(old, new)
- void load_context(new)
- register thread_t new;
- {
-- switch_ktss(new->pcb);
-+ switch_ktss(new);
- Load_context(new);
- }
-
-@@ -304,7 +305,7 @@ thread_t switch_context(old, continuatio
- /*
- * Load the rest of the user state for the new thread
- */
-- switch_ktss(new->pcb);
-+ switch_ktss(new);
-
- return Switch_context(old, continuation, new);
- }
-@@ -317,7 +318,6 @@ void pcb_module_init()
- 0, "i386 pcb state");
-
- fpu_module_init();
-- iopb_init();
- }
-
- void pcb_init(thread)
-@@ -361,8 +361,6 @@ void pcb_terminate(thread)
- counter(if (--c_threads_current < c_threads_min)
- c_threads_min = c_threads_current);
-
-- if (pcb->ims.io_tss != 0)
-- iopb_destroy(pcb->ims.io_tss);
- if (pcb->ims.ifps != 0)
- fp_free(pcb->ims.ifps);
- if (pcb->ims.ldt != 0)
-@@ -382,6 +380,30 @@ void pcb_collect(thread)
- {
- }
-
-+void machine_task_module_init(void)
-+{
-+ iopb_init();
-+}
-+
-+void machine_task_init(new_task)
-+ task_t new_task;
-+{
-+ new_task->machine.io_tss = 0;
-+}
-+
-+void machine_task_terminate(task)
-+ task_t task;
-+{
-+ if (task->machine.io_tss != 0)
-+ iopb_destroy(task->machine.io_tss);
-+}
-+
-+void machine_task_collect(task)
-+ task_t task;
-+{
-+ /* TODO: compare io_tss with 0xff, XXX: not if it is still in use, and
-+ * beware of races with threads adding io perms! */
-+}
-
- /*
- * thread_setstatus:
-@@ -516,28 +538,40 @@ kern_return_t thread_setstatus(thread, f
- */
- case i386_ISA_PORT_MAP_STATE: {
- register struct i386_isa_port_map_state *state;
-- register iopb_tss_t tss;
-+ register iopb_tss_t tss, old_tss;
-+ task_t task;
-
- if (count < i386_ISA_PORT_MAP_STATE_COUNT)
- return(KERN_INVALID_ARGUMENT);
-
--#if 0
- /*
- * If the thread has no ktss yet,
- * we must allocate one.
- */
-
- state = (struct i386_isa_port_map_state *) tstate;
-- tss = thread->pcb->ims.io_tss;
-+ task = thread->task;
-+ task_lock(task);
-+ tss = task->machine.io_tss;
- if (tss == 0) {
-+ task_unlock(task);
- tss = iopb_create();
-- thread->pcb->ims.io_tss = tss;
-+ task_lock(task);
-+ old_tss = task->machine.io_tss;
-+ if (old_tss == 0) {
-+ task->machine.io_tss = tss;
-+ } else {
-+ task_unlock(task);
-+ iopb_destroy(tss);
-+ tss = old_tss;
-+ task_lock(task);
-+ }
- }
-
- memcpy(tss->bitmap,
- state->pm,
- sizeof state->pm);
--#endif
-+ task_unlock(task);
- break;
- }
-
-@@ -674,16 +708,21 @@ kern_return_t thread_getstatus(thread, f
- case i386_ISA_PORT_MAP_STATE: {
- register struct i386_isa_port_map_state *state;
- register iopb_tss_t tss;
-+ task_t task;
-
- if (*count < i386_ISA_PORT_MAP_STATE_COUNT)
- return(KERN_INVALID_ARGUMENT);
-
- state = (struct i386_isa_port_map_state *) tstate;
-- tss = thread->pcb->ims.io_tss;
-+ task = thread->task;
-+ task_lock(task);
-+ tss = task->machine.io_tss;
-
- if (tss == 0) {
- int i;
-
-+ task_unlock(task);
-+
- /*
- * The thread has no ktss, so no IO permissions.
- */
-@@ -698,6 +737,7 @@ kern_return_t thread_getstatus(thread, f
- memcpy(state->pm,
- tss->bitmap,
- sizeof state->pm);
-+ task_unlock(task);
- }
-
- *count = i386_ISA_PORT_MAP_STATE_COUNT;
-Index: i386/i386/thread.h
-===================================================================
---- i386/i386/thread.h.orig 2007-04-05 07:31:16.000000000 +0300
-+++ i386/i386/thread.h 2007-04-05 07:31:26.000000000 +0300
-@@ -163,13 +163,16 @@ struct i386_interrupt_state {
- */
-
- struct i386_machine_state {
-- iopb_tss_t io_tss;
- struct user_ldt * ldt;
- struct i386_fpsave_state *ifps;
- struct v86_assist_state v86s;
- struct real_descriptor user_gdt[USER_GDT_SLOTS];
- };
-
-+typedef struct machine_task {
-+ iopb_tss_t io_tss;
-+} machine_task_t;
-+
- typedef struct pcb {
- struct i386_interrupt_state iis[2]; /* interrupt and NMI */
- struct i386_saved_state iss;
-Index: i386/i386/user_ldt.c
-===================================================================
---- i386/i386/user_ldt.c.orig 2007-04-05 06:37:23.000000000 +0300
-+++ i386/i386/user_ldt.c 2007-04-05 07:31:26.000000000 +0300
-@@ -249,7 +249,7 @@ i386_set_ldt(thread, first_selector, des
- * make sure it is properly set.
- */
- if (thread == current_thread())
-- switch_ktss(pcb);
-+ switch_ktss(thread);
- }
-
- /*
-Index: kern/task.c
-===================================================================
---- kern/task.c.orig 2007-02-11 14:51:17.000000000 +0200
-+++ kern/task.c 2007-04-05 07:31:26.000000000 +0300
-@@ -67,6 +67,7 @@ void task_init(void)
- 0, "tasks");
-
- eml_init();
-+ machine_task_module_init ();
-
- /*
- * Create the kernel task as the first task.
-@@ -145,6 +146,7 @@ kern_return_t task_create(
- eml_task_reference(new_task, parent_task);
-
- ipc_task_init(new_task, parent_task);
-+ machine_task_init(new_task);
-
- new_task->total_user_time.seconds = 0;
- new_task->total_user_time.microseconds = 0;
-@@ -220,6 +222,8 @@ void task_deallocate(
- if (c != 0)
- return;
-
-+ machine_task_terminate (task);
-+
- eml_task_deallocate(task);
-
- pset = task->processor_set;
-@@ -1092,6 +1096,7 @@ void task_collect_scan(void)
- pset_unlock(pset);
- simple_unlock(&all_psets_lock);
-
-+ machine_task_collect (task);
- pmap_collect(task->map->pmap);
-
- if (prev_task != TASK_NULL)
-Index: kern/task.h
-===================================================================
---- kern/task.h.orig 2006-10-15 20:39:24.000000000 +0300
-+++ kern/task.h 2007-04-05 07:31:26.000000000 +0300
-@@ -45,6 +45,7 @@
- #include <kern/pc_sample.h>
- #include <kern/processor.h>
- #include <kern/syscall_emulation.h>
-+#include <machine/thread.h>
- #include <vm/vm_map.h>
-
- struct task {
-@@ -98,6 +99,9 @@ struct task {
- vm_offset_t fast_tas_base[TASK_FAST_TAS_NRAS];
- vm_offset_t fast_tas_end[TASK_FAST_TAS_NRAS];
- #endif /* FAST_TAS */
-+
-+ /* Hardware specific data. */
-+ machine_task_t machine;
- };
-
- #define task_lock(task) simple_lock(&(task)->lock)
diff --git a/debian/patches/46_io_device.patch b/debian/patches/46_io_device.patch
deleted file mode 100644
index a3a599b..0000000
--- a/debian/patches/46_io_device.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-2006-01-07 Samuel Thibault <samuel.thibault@ens-lyon.org>
-
- * i386/i386/iopb.c: Include <device/io_req.h> for io_req_t. New "io"
- device.
- (ioopen): New function.
- (ioclose): Likewise.
- (io_bitmap_set): Treat special (-1) bit list as "all ports".
- (io_bitmap_clear): Likewise.
-
-
-Index: i386/i386/iopb.c
-===================================================================
---- i386/i386/iopb.c.orig 2007-04-05 07:31:26.000000000 +0300
-+++ i386/i386/iopb.c 2007-04-05 07:31:31.000000000 +0300
-@@ -40,6 +40,7 @@
- #include <kern/thread.h>
-
- #include <device/dev_hdr.h>
-+#include <device/io_req.h>
-
- #include "io_port.h"
- #include "iopb.h"
-@@ -84,6 +85,32 @@ typedef struct io_use *io_use_t;
- decl_simple_lock_data(, iopb_lock)
-
- /*
-+ * Special "all I/O ports" device.
-+ */
-+mach_device_t io_device = 0;
-+
-+int ioopen(dev, flag, ior)
-+ int dev;
-+ int flag;
-+ io_req_t ior;
-+{
-+ io_device = ior->io_device;
-+
-+ io_port_create(io_device, (io_reg_t *)(-1));
-+ return (0);
-+}
-+
-+int
-+ioclose(dev, flags)
-+ int dev;
-+ int flags;
-+{
-+ io_port_destroy(io_device);
-+ io_device = 0;
-+ return 0;
-+}
-+
-+/*
- * Initialize the package.
- */
- void
-@@ -132,9 +159,12 @@ io_bitmap_set(
- {
- io_reg_t io_bit;
-
-- while ((io_bit = *bit_list++) != IO_REG_NULL) {
-- bp[io_bit>>3] &= ~(1 << (io_bit & 0x7));
-- }
-+ if (bit_list == (io_reg_t *)(-1))
-+ memset(bp, 0, IOPB_BYTES);
-+ else
-+ while ((io_bit = *bit_list++) != IO_REG_NULL) {
-+ bp[io_bit>>3] &= ~(1 << (io_bit & 0x7));
-+ }
- }
-
- /*
-@@ -147,9 +177,12 @@ io_bitmap_clear(
- {
- io_reg_t io_bit;
-
-- while ((io_bit = *bit_list++) != IO_REG_NULL) {
-- bp[io_bit>>3] |= (1 << (io_bit & 0x7));
-- }
-+ if (bit_list == (io_reg_t *)(-1))
-+ memset(bp, ~0, IOPB_BYTES);
-+ else
-+ while ((io_bit = *bit_list++) != IO_REG_NULL) {
-+ bp[io_bit>>3] |= (1 << (io_bit & 0x7));
-+ }
- }
-
- /*
-Index: i386/i386at/conf.c
-===================================================================
---- i386/i386at/conf.c.orig 2007-04-05 06:37:23.000000000 +0300
-+++ i386/i386at/conf.c 2007-04-05 07:31:31.000000000 +0300
-@@ -58,6 +58,9 @@ extern int kbdgetstat(), kbdsetstat();
- extern int mouseopen(), mouseclose(), mouseread(), mousegetstat();
- #define mousename "mouse"
-
-+extern int ioopen(), ioclose();
-+#define ioname "io"
-+
- extern int kmsgopen(), kmsgclose(), kmsgread(), kmsggetstat();
- #define kmsgname "kmsg"
-
-@@ -89,6 +92,11 @@ struct dev_ops dev_name_list[] =
- nodev, nulldev, nulldev, 0,
- nodev },
-
-+ { ioname, ioopen, ioclose, nodev,
-+ nodev, nodev, nodev, nodev,
-+ nodev, nulldev, nulldev, 0,
-+ nodev },
-+
- #if NCOM > 0
- { comname, comopen, comclose, comread,
- comwrite, comgetstat, comsetstat, nomap,
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.
diff --git a/debian/patches/series b/debian/patches/series
index b4c9b1b..2b2944d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,10 +7,4 @@
15_mem_obj_proxy.patch -p0
20_mmx_support.patch -p0
24_pci_irq_fix.patch -p1
-41_io_unlock_ioremove.patch -p0
-42_disable_ioperm.patch -p0
-43_debvice_port_fix.patch -p0
-44_more_ports.patch -p0
-45_io_per_task.patch -p0
-46_io_device.patch -p0
90_autoconf_autogen.patch -p0
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-17 18:25:09 +0000