- debian/patches/12_sis900.patch: Unfuzzy.

    - debian/patches/13_ide_dma.patch: Likewise.
    - debian/patches/14_alloc_params.patch: Likewise.
    - debian/patches/45_io_per_task.patch: Likewise.
    - debian/patches/46_io_device.patch: Likewise.

7 files changed, 51 insertions, 45 deletions

diff --git a/debian/changelog b/debian/changelog
index 94fa87a..0d80f36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,12 @@ gnumach (2:1.3.99.dfsg.cvs20070405-1) UNRELEASED; urgency=low
   * New upstream CVS snapshot.
     - debian/patches/44_more_ports.patch: Sync.
     - debian/patches/45_io_per_task.patch: Likewise.
+    - debian/patches/05_halt_on_panic_flag.patch
+    - debian/patches/12_sis900.patch: Unfuzzy.
+    - debian/patches/13_ide_dma.patch: Likewise.
+    - debian/patches/14_alloc_params.patch: Likewise.
+    - debian/patches/45_io_per_task.patch: Likewise.
+    - debian/patches/46_io_device.patch: Likewise.
     - debian/patches/90_autoconf_autogen.patch: Regenerated.
 
  -- Guillem Jover <guillem@debian.org>  Thu, 05 Apr 2007 06:40:10 +0300
diff --git a/debian/patches/05_halt_on_panic_flag.patch b/debian/patches/05_halt_on_panic_flag.patch
index 32575b0..f9e081c 100644
--- a/debian/patches/05_halt_on_panic_flag.patch
+++ b/debian/patches/05_halt_on_panic_flag.patch
@@ -9,9 +9,9 @@
 
 Index: i386/i386at/model_dep.c
 ===================================================================
---- i386/i386at/model_dep.c.orig	2006-11-14 03:58:57.000000000 +0200
-+++ i386/i386at/model_dep.c	2006-11-14 04:15:06.000000000 +0200
-@@ -95,6 +95,10 @@ void		inittodr();	/* forward */
+--- i386/i386at/model_dep.c.orig	2007-02-11 14:51:13.000000000 +0200
++++ i386/i386at/model_dep.c	2007-04-05 07:29:39.000000000 +0300
+@@ -96,6 +96,10 @@ void		inittodr();	/* forward */
  
  int		rebootflag = 0;	/* exported to kdintr */
  
@@ -22,7 +22,7 @@ Index: i386/i386at/model_dep.c
  /* XX interrupt stack pointer and highwater mark, for locore.S.  */
  vm_offset_t int_stack_top, int_stack_high;
  
-@@ -354,6 +358,11 @@ void c_boot_entry(vm_offset_t bi)
+@@ -367,6 +371,11 @@ void c_boot_entry(vm_offset_t bi)
  		cninit();		/* need console for debugger */
  		Debugger();
  	}
@@ -37,7 +37,7 @@ Index: i386/i386at/model_dep.c
 Index: kern/debug.c
 ===================================================================
 --- kern/debug.c.orig	2006-11-14 03:58:57.000000000 +0200
-+++ kern/debug.c	2006-11-14 04:15:06.000000000 +0200
++++ kern/debug.c	2007-04-05 07:29:39.000000000 +0300
 @@ -124,6 +124,10 @@ panic_init()
  	}
  }
diff --git a/debian/patches/12_sis900.patch b/debian/patches/12_sis900.patch
index 0b1e8d8..034182b 100644
--- a/debian/patches/12_sis900.patch
+++ b/debian/patches/12_sis900.patch
@@ -12,7 +12,7 @@
 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	2007-02-11 15:07:05.000000000 +0200
++++ linux/dev/drivers/net/Space.c	2007-04-05 07:30:59.000000000 +0300
 @@ -93,6 +93,7 @@ extern int yellowfin_probe(struct device
  extern int eepro100_probe(struct device *);
  extern int epic100_probe(struct device *);
@@ -34,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	2007-02-11 15:07:05.000000000 +0200
++++ linux/src/drivers/net/sis900.c	2007-04-05 07:31:00.000000000 +0300
 @@ -0,0 +1,1803 @@
 +/* sis900.c: A SiS 900/7016 PCI Fast Ethernet driver for Linux.
 +   Copyright 1999 Silicon Integrated System Corporation
@@ -1842,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	2007-02-11 15:07:05.000000000 +0200
++++ linux/src/drivers/net/sis900.h	2007-04-05 07:31:00.000000000 +0300
 @@ -0,0 +1,284 @@
 +/* sis900.h Definitions for SiS ethernet controllers including 7014/7016 and 900
 + * Copyright 1999 Silicon Integrated System Corporation
@@ -2130,9 +2130,9 @@ Index: linux/src/drivers/net/sis900.h
 +#define SIOCSMIIREG (SIOCDEVPRIVATE+2)		/* Write a PHY register */
 Index: linux/configfrag.ac
 ===================================================================
---- 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],
+--- linux/configfrag.ac.orig	2007-03-06 06:37:45.000000000 +0200
++++ linux/configfrag.ac	2007-04-05 07:31:00.000000000 +0300
+@@ -420,6 +420,10 @@ AC_Linux_DRIVER([seeq8005],
    [Ethernet controller Seeq8005],
    [CONFIG_SEEQ8005],
    [net])
@@ -2145,9 +2145,9 @@ Index: linux/configfrag.ac
    [CONFIG_SK_G16],
 Index: linux/Makefrag.am
 ===================================================================
---- 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/Makefrag.am.orig	2007-03-06 06:37:45.000000000 +0200
++++ linux/Makefrag.am	2007-04-05 07:31:00.000000000 +0300
+@@ -526,6 +526,11 @@ liblinux_a_SOURCES += \
  	linux/src/drivers/net/seeq8005.h
  endif
  
diff --git a/debian/patches/13_ide_dma.patch b/debian/patches/13_ide_dma.patch
index ab44d94..6602beb 100644
--- a/debian/patches/13_ide_dma.patch
+++ b/debian/patches/13_ide_dma.patch
@@ -7,7 +7,7 @@ supporting hardware.
 Index: linux/src/drivers/block/ide.c
 ===================================================================
 --- linux/src/drivers/block/ide.c.orig	2006-10-15 20:39:24.000000000 +0300
-+++ linux/src/drivers/block/ide.c	2006-10-26 00:03:24.000000000 +0300
++++ linux/src/drivers/block/ide.c	2007-04-05 07:31:06.000000000 +0300
 @@ -3594,9 +3594,6 @@ static void ide_probe_promise_20246(void
  		hwif->ctl_port = io[tmp + 1] + 2;
  		hwif->noprobe = 0;
@@ -42,7 +42,7 @@ Index: linux/src/drivers/block/ide.c
 Index: linux/src/drivers/block/ide.h
 ===================================================================
 --- linux/src/drivers/block/ide.h.orig	1999-04-26 08:51:39.000000000 +0300
-+++ linux/src/drivers/block/ide.h	2006-10-26 00:03:24.000000000 +0300
++++ linux/src/drivers/block/ide.h	2007-04-05 07:31:06.000000000 +0300
 @@ -429,7 +429,8 @@ typedef void (ide_selectproc_t) (ide_dri
  typedef enum {	ide_unknown,	ide_generic,	ide_triton,
  		ide_cmd640,	ide_dtc2278,	ide_ali14xx,
@@ -56,7 +56,7 @@ Index: linux/src/drivers/block/ide.h
 Index: linux/src/drivers/block/triton.c
 ===================================================================
 --- linux/src/drivers/block/triton.c.orig	1999-04-26 08:51:41.000000000 +0300
-+++ linux/src/drivers/block/triton.c	2006-10-26 00:03:24.000000000 +0300
++++ linux/src/drivers/block/triton.c	2007-04-05 07:31:06.000000000 +0300
 @@ -1,107 +1,20 @@
  /*
   *  linux/drivers/block/triton.c	Version 1.13  Aug 12, 1996
@@ -1004,7 +1004,7 @@ Index: linux/src/drivers/block/triton.c
 Index: linux/src/include/linux/hdreg.h
 ===================================================================
 --- linux/src/include/linux/hdreg.h.orig	1999-04-26 08:56:27.000000000 +0300
-+++ linux/src/include/linux/hdreg.h	2006-10-26 00:03:24.000000000 +0300
++++ linux/src/include/linux/hdreg.h	2007-04-05 07:31:06.000000000 +0300
 @@ -92,11 +92,12 @@ struct hd_geometry {
  #define HDIO_GETGEO		0x0301	/* get device geometry */
  #define HDIO_GET_UNMASKINTR	0x0302	/* get current unmask setting */
@@ -1079,9 +1079,9 @@ Index: linux/src/include/linux/hdreg.h
  #ifdef __KERNEL__
 Index: linux/configfrag.ac
 ===================================================================
---- linux/configfrag.ac.orig	2006-10-26 00:06:29.000000000 +0300
-+++ linux/configfrag.ac	2006-10-26 00:05:59.000000000 +0300
-@@ -132,6 +132,11 @@ AC_Linux_DRIVER([ide],
+--- linux/configfrag.ac.orig	2007-04-05 07:31:00.000000000 +0300
++++ linux/configfrag.ac	2007-04-05 07:31:06.000000000 +0300
+@@ -129,6 +129,11 @@ AC_Linux_DRIVER([ide],
    [IDE disk controllers],
    [CONFIG_BLK_DEV_IDE])
  
diff --git a/debian/patches/14_alloc_params.patch b/debian/patches/14_alloc_params.patch
index af42331..9edd94e 100644
--- a/debian/patches/14_alloc_params.patch
+++ b/debian/patches/14_alloc_params.patch
@@ -8,7 +8,7 @@
 Index: kern/mach_param.h
 ===================================================================
 --- kern/mach_param.h.orig	2001-04-05 09:39:20.000000000 +0300
-+++ kern/mach_param.h	2006-11-14 04:15:28.000000000 +0200
++++ kern/mach_param.h	2007-04-05 07:31:10.000000000 +0300
 @@ -38,16 +38,16 @@
  #ifndef	_KERN_MACH_PARAM_H_
  #define _KERN_MACH_PARAM_H_
@@ -32,9 +32,9 @@ Index: kern/mach_param.h
  #define PORT_MAX	((TASK_MAX * 3 + THREAD_MAX)	/* kernel */ \
 Index: kern/zalloc.c
 ===================================================================
---- kern/zalloc.c.orig	2006-11-14 03:58:57.000000000 +0200
-+++ kern/zalloc.c	2006-11-14 04:15:28.000000000 +0200
-@@ -102,7 +102,7 @@ zone_t		zone_zone;	/* this is the zone c
+--- kern/zalloc.c.orig	2007-02-11 14:51:17.000000000 +0200
++++ kern/zalloc.c	2007-04-05 07:31:10.000000000 +0300
+@@ -105,7 +105,7 @@ zone_t		zone_zone;	/* this is the zone c
  boolean_t	zone_ignore_overflow = TRUE;
  
  vm_map_t	zone_map = VM_MAP_NULL;
diff --git a/debian/patches/45_io_per_task.patch b/debian/patches/45_io_per_task.patch
index aac4c17..9cc73df 100644
--- a/debian/patches/45_io_per_task.patch
+++ b/debian/patches/45_io_per_task.patch
@@ -30,8 +30,8 @@
 
 Index: i386/i386/iopb.c
 ===================================================================
---- i386/i386/iopb.c.orig	2006-11-14 04:16:04.000000000 +0200
-+++ i386/i386/iopb.c	2006-11-14 04:16:29.000000000 +0200
+--- 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;
  
  /*
@@ -275,8 +275,8 @@ Index: i386/i386/iopb.c
  }
 Index: i386/i386/pcb.c
 ===================================================================
---- i386/i386/pcb.c.orig	2006-11-14 03:58:56.000000000 +0200
-+++ i386/i386/pcb.c	2006-11-14 04:20:29.000000000 +0200
+--- 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)])
@@ -448,9 +448,9 @@ Index: i386/i386/pcb.c
  		*count = i386_ISA_PORT_MAP_STATE_COUNT;
 Index: i386/i386/thread.h
 ===================================================================
---- i386/i386/thread.h.orig	2006-11-14 03:58:56.000000000 +0200
-+++ i386/i386/thread.h	2006-11-14 04:21:24.000000000 +0200
-@@ -158,13 +158,16 @@ struct i386_interrupt_state {
+--- 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 {
@@ -470,8 +470,8 @@ Index: i386/i386/thread.h
  	struct i386_saved_state iss;
 Index: i386/i386/user_ldt.c
 ===================================================================
---- i386/i386/user_ldt.c.orig	2006-11-14 03:58:56.000000000 +0200
-+++ i386/i386/user_ldt.c	2006-11-14 04:16:29.000000000 +0200
+--- 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.
  	     */
@@ -483,8 +483,8 @@ Index: i386/i386/user_ldt.c
  	/*
 Index: kern/task.c
 ===================================================================
---- kern/task.c.orig	2006-11-14 03:58:57.000000000 +0200
-+++ kern/task.c	2006-11-14 04:16:29.000000000 +0200
+--- 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");
  
@@ -521,7 +521,7 @@ Index: kern/task.c
 Index: kern/task.h
 ===================================================================
 --- kern/task.h.orig	2006-10-15 20:39:24.000000000 +0300
-+++ kern/task.h	2006-11-14 04:16:29.000000000 +0200
++++ kern/task.h	2007-04-05 07:31:26.000000000 +0300
 @@ -45,6 +45,7 @@
  #include <kern/pc_sample.h>
  #include <kern/processor.h>
diff --git a/debian/patches/46_io_device.patch b/debian/patches/46_io_device.patch
index 584a651..a3a599b 100644
--- a/debian/patches/46_io_device.patch
+++ b/debian/patches/46_io_device.patch
@@ -10,8 +10,8 @@
 
 Index: i386/i386/iopb.c
 ===================================================================
---- i386/i386/iopb.c.orig	2006-11-14 04:16:29.000000000 +0200
-+++ i386/i386/iopb.c	2006-11-14 04:21:48.000000000 +0200
+--- 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>
  
@@ -87,11 +87,11 @@ Index: i386/i386/iopb.c
  /*
 Index: i386/i386at/conf.c
 ===================================================================
---- i386/i386at/conf.c.orig	2006-10-15 20:39:23.000000000 +0300
-+++ i386/i386at/conf.c	2006-11-14 04:21:48.000000000 +0200
-@@ -64,6 +64,9 @@ extern int	ioplopen(), ioplclose();
- extern vm_offset_t ioplmmap();
- #define	ioplname		"iopl"
+--- 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"
@@ -99,7 +99,7 @@ Index: i386/i386at/conf.c
  extern int	kmsgopen(), kmsgclose(), kmsgread(), kmsggetstat();
  #define kmsgname		"kmsg"
  
-@@ -95,6 +98,11 @@ struct dev_ops	dev_name_list[] =
+@@ -89,6 +92,11 @@ struct dev_ops	dev_name_list[] =
  	  nodev,	nulldev,	nulldev,	0,
  	  nodev },