From be37238e3eb41075a981e33530cd26c666e53552 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Wed, 1 Nov 2006 01:46:18 +0000 Subject: New upstream CVS snapshot. - Remove debian/rules.options, now unneeded with the default configure options. - debian/patches/01_gcc-4.1.patch: Removed, merged upstream. - debian/patches/00_clean_gfdl.patch: Sync. - debian/patches/05_halt_on_panic_flag.patch: Likewise. - debian/patches/10_cdromlock.patch: Likewise. - debian/patches/12_sis900.patch: Likewise. - debian/patches/13_ide_dma.patch: Likewise. - debian/patches/14_alloc_params.patch: Likewise. - debian/patches/15_mem_obj_proxy.patch: Likewise. - debian/patches/44_more_ports.patch: Likewise. - debian/patches/45_io_per_task.patch: Likewise. - debian/patches/46_io_device.patch: Likewise. - debian/patches/90_autoconf_autogen.patch: Regenerated. - debian/patches/61_vm_resident-zoned.patch: Disable for now, it's causing problems with current applied patches in CVS. --- debian/patches/46_io_device.patch | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) (limited to 'debian/patches/46_io_device.patch') diff --git a/debian/patches/46_io_device.patch b/debian/patches/46_io_device.patch index 606115a..7772f7a 100644 --- a/debian/patches/46_io_device.patch +++ b/debian/patches/46_io_device.patch @@ -1,5 +1,3 @@ -#DPATCHLEVEL=1 - 2006-01-07 Samuel Thibault * i386/i386/iopb.c: Include for io_req_t. New "io" @@ -10,9 +8,10 @@ (io_bitmap_clear): Likewise. -diff -urp gnumach-mine-5-io_per_task/i386/i386/iopb.c gnumach-mine-6-io_device/i386/i386/iopb.c ---- gnumach-mine-5-io_per_task/i386/i386/iopb.c 2005-12-29 23:42:34.000000000 +0100 -+++ gnumach-mine-6-io_device/i386/i386/iopb.c 2006-01-07 00:19:24.000000000 +0100 +Index: i386/i386/iopb.c +=================================================================== +--- i386/i386/iopb.c.orig 2006-10-26 00:17:32.000000000 +0300 ++++ i386/i386/iopb.c 2006-10-26 00:17:37.000000000 +0300 @@ -38,6 +38,7 @@ #include @@ -21,7 +20,7 @@ diff -urp gnumach-mine-5-io_per_task/i386/i386/iopb.c gnumach-mine-6-io_device/i #include "io_port.h" #include "iopb.h" -@@ -82,6 +83,32 @@ +@@ -82,6 +83,32 @@ typedef struct io_use *io_use_t; decl_simple_lock_data(, iopb_lock) /* @@ -86,16 +85,11 @@ diff -urp gnumach-mine-5-io_per_task/i386/i386/iopb.c gnumach-mine-6-io_device/i } /* - -2006-01-07 Samuel Thibault - - * conf.c: New "io" device. - (dev_name_list): Added "io" device. - -diff -urp gnumach-mine-5-io_per_task/i386/i386at/conf.c gnumach-mine-6-io_device/i386/i386at/conf.c ---- gnumach-mine-5-io_per_task/i386/i386at/conf.c 2006-01-06 23:43:24.000000000 +0100 -+++ gnumach-mine-6-io_device/i386/i386at/conf.c 2006-01-06 23:43:44.000000000 +0100 -@@ -66,6 +66,9 @@ extern int ioplopen(), ioplclose(); +Index: i386/i386at/conf.c +=================================================================== +--- i386/i386at/conf.c.orig 2006-10-26 00:16:49.000000000 +0300 ++++ i386/i386at/conf.c 2006-10-26 00:17:37.000000000 +0300 +@@ -64,6 +64,9 @@ extern int ioplopen(), ioplclose(); extern vm_offset_t ioplmmap(); #define ioplname "iopl" @@ -105,7 +99,7 @@ diff -urp gnumach-mine-5-io_per_task/i386/i386at/conf.c gnumach-mine-6-io_device extern int kmsgopen(), kmsgclose(), kmsgread(), kmsggetstat(); #define kmsgname "kmsg" -@@ -97,6 +100,11 @@ struct dev_ops dev_name_list[] = +@@ -95,6 +98,11 @@ struct dev_ops dev_name_list[] = nodev, nulldev, nulldev, 0, nodev }, -- cgit v1.2.3