Refresh patches with -pab

16 files changed, 154 insertions, 178 deletions

diff --git a/debian/patches/00_clean_gfdl.patch b/debian/patches/00_clean_gfdl.patch
index 3bb61f4..8dd4133 100644
--- a/debian/patches/00_clean_gfdl.patch
+++ b/debian/patches/00_clean_gfdl.patch
@@ -1,7 +1,7 @@
-Index: Makefile.am
+Index: b/Makefile.am
 ===================================================================
---- Makefile.am.orig	2007-03-06 06:37:41.000000000 +0200
-+++ Makefile.am	2007-03-06 07:05:51.000000000 +0200
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -110,7 +110,7 @@ include Makefrag.am
  include tests/Makefrag.am
  
diff --git a/debian/patches/05_halt_on_panic_flag.patch b/debian/patches/05_halt_on_panic_flag.patch
index f9e081c..5d99852 100644
--- a/debian/patches/05_halt_on_panic_flag.patch
+++ b/debian/patches/05_halt_on_panic_flag.patch
@@ -7,10 +7,10 @@
 	argument.
 
 
-Index: i386/i386at/model_dep.c
+Index: b/i386/i386at/model_dep.c
 ===================================================================
---- 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
+--- a/i386/i386at/model_dep.c
++++ b/i386/i386at/model_dep.c
 @@ -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;
  
-@@ -367,6 +371,11 @@ void c_boot_entry(vm_offset_t bi)
+@@ -368,6 +372,11 @@ void c_boot_entry(vm_offset_t bi)
  		cninit();		/* need console for debugger */
  		Debugger();
  	}
@@ -34,11 +34,11 @@ Index: i386/i386at/model_dep.c
  #endif	/* MACH_KDB */
  
  	machine_slot[0].is_cpu = TRUE;
-Index: kern/debug.c
+Index: b/kern/debug.c
 ===================================================================
---- kern/debug.c.orig	2006-11-14 03:58:57.000000000 +0200
-+++ kern/debug.c	2007-04-05 07:29:39.000000000 +0300
-@@ -124,6 +124,10 @@ panic_init()
+--- a/kern/debug.c
++++ b/kern/debug.c
+@@ -124,6 +124,10 @@ panic_init(void)
  	}
  }
  
diff --git a/debian/patches/10_cdromlock.patch b/debian/patches/10_cdromlock.patch
index 9d97c95..ac03488 100644
--- a/debian/patches/10_cdromlock.patch
+++ b/debian/patches/10_cdromlock.patch
@@ -1,7 +1,7 @@
-Index: linux/dev/glue/block.c
+Index: b/linux/dev/glue/block.c
 ===================================================================
---- linux/dev/glue/block.c.orig	2006-10-15 20:39:24.000000000 +0300
-+++ linux/dev/glue/block.c	2007-02-11 15:06:41.000000000 +0200
+--- a/linux/dev/glue/block.c
++++ b/linux/dev/glue/block.c
 @@ -789,6 +789,7 @@ static struct block_data *open_list;
  extern struct device_emulation_ops linux_block_emulation_ops;
  
diff --git a/debian/patches/12_sis900.patch b/debian/patches/12_sis900.patch
index 034182b..5d999cf 100644
--- a/debian/patches/12_sis900.patch
+++ b/debian/patches/12_sis900.patch
@@ -9,10 +9,10 @@
 	* linux/src/drivers/net/sis900.h: Likewise.
 
 
-Index: linux/dev/drivers/net/Space.c
+Index: b/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-04-05 07:30:59.000000000 +0300
+--- a/linux/dev/drivers/net/Space.c
++++ b/linux/dev/drivers/net/Space.c
 @@ -93,6 +93,7 @@ extern int yellowfin_probe(struct device
  extern int eepro100_probe(struct device *);
  extern int epic100_probe(struct device *);
@@ -31,10 +31,10 @@ Index: linux/dev/drivers/net/Space.c
  #ifdef CONFIG_VIA_RHINE
  	&& via_rhine_probe(dev)
  #endif
-Index: linux/src/drivers/net/sis900.c
+Index: b/linux/src/drivers/net/sis900.c
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux/src/drivers/net/sis900.c	2007-04-05 07:31:00.000000000 +0300
+--- /dev/null
++++ b/linux/src/drivers/net/sis900.c
 @@ -0,0 +1,1803 @@
 +/* sis900.c: A SiS 900/7016 PCI Fast Ethernet driver for Linux.
 +   Copyright 1999 Silicon Integrated System Corporation
@@ -1839,10 +1839,10 @@ Index: linux/src/drivers/net/sis900.c
 +}
 +
 +#endif	/* MODULE */
-Index: linux/src/drivers/net/sis900.h
+Index: b/linux/src/drivers/net/sis900.h
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux/src/drivers/net/sis900.h	2007-04-05 07:31:00.000000000 +0300
+--- /dev/null
++++ b/linux/src/drivers/net/sis900.h
 @@ -0,0 +1,284 @@
 +/* sis900.h Definitions for SiS ethernet controllers including 7014/7016 and 900
 + * Copyright 1999 Silicon Integrated System Corporation
@@ -2128,11 +2128,11 @@ Index: linux/src/drivers/net/sis900.h
 +#define SIOCGMIIPHY (SIOCDEVPRIVATE)		/* Get the PHY in use. */
 +#define SIOCGMIIREG (SIOCDEVPRIVATE+1)		/* Read a PHY register. */
 +#define SIOCSMIIREG (SIOCDEVPRIVATE+2)		/* Write a PHY register */
-Index: linux/configfrag.ac
+Index: b/linux/configfrag.ac
 ===================================================================
---- 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],
+--- a/linux/configfrag.ac
++++ b/linux/configfrag.ac
+@@ -431,6 +431,10 @@ AC_Linux_DRIVER([seeq8005],
    [Ethernet controller Seeq8005],
    [CONFIG_SEEQ8005],
    [net])
@@ -2143,10 +2143,10 @@ Index: linux/configfrag.ac
  AC_Linux_DRIVER([sk_g16],
    [Ethernet controller Schneider & Koch G16],
    [CONFIG_SK_G16],
-Index: linux/Makefrag.am
+Index: b/linux/Makefrag.am
 ===================================================================
---- linux/Makefrag.am.orig	2007-03-06 06:37:45.000000000 +0200
-+++ linux/Makefrag.am	2007-04-05 07:31:00.000000000 +0300
+--- a/linux/Makefrag.am
++++ b/linux/Makefrag.am
 @@ -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 6602beb..c17ee2a 100644
--- a/debian/patches/13_ide_dma.patch
+++ b/debian/patches/13_ide_dma.patch
@@ -4,10 +4,10 @@ supporting hardware.
 2004-09-17  Sergio Lopez  <koro@sinrega.org>
 
 
-Index: linux/src/drivers/block/ide.c
+Index: b/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	2007-04-05 07:31:06.000000000 +0300
+--- a/linux/src/drivers/block/ide.c
++++ b/linux/src/drivers/block/ide.c
 @@ -3594,9 +3594,6 @@ static void ide_probe_promise_20246(void
  		hwif->ctl_port = io[tmp + 1] + 2;
  		hwif->noprobe = 0;
@@ -39,10 +39,10 @@ Index: linux/src/drivers/block/ide.c
  	probe_for_hwifs ();
  
  	/*
-Index: linux/src/drivers/block/ide.h
+Index: b/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	2007-04-05 07:31:06.000000000 +0300
+--- a/linux/src/drivers/block/ide.h
++++ b/linux/src/drivers/block/ide.h
 @@ -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,
@@ -53,10 +53,10 @@ Index: linux/src/drivers/block/ide.h
  	hwif_chipset_t;
  
  typedef struct hwif_s {
-Index: linux/src/drivers/block/triton.c
+Index: b/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	2007-04-05 07:31:06.000000000 +0300
+--- a/linux/src/drivers/block/triton.c
++++ b/linux/src/drivers/block/triton.c
 @@ -1,107 +1,20 @@
  /*
   *  linux/drivers/block/triton.c	Version 1.13  Aug 12, 1996
@@ -1001,10 +1001,10 @@ Index: linux/src/drivers/block/triton.c
 -	printk(KERN_WARNING "ide: Promise/33 not configured correctly (BIOS)\n");
 +	quit: if (rc) printk("ide: pcibios access failed - %s\n", pcibios_strerror(rc));
  }
-Index: linux/src/include/linux/hdreg.h
+Index: b/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	2007-04-05 07:31:06.000000000 +0300
+--- a/linux/src/include/linux/hdreg.h
++++ b/linux/src/include/linux/hdreg.h
 @@ -92,11 +92,12 @@ struct hd_geometry {
  #define HDIO_GETGEO		0x0301	/* get device geometry */
  #define HDIO_GET_UNMASKINTR	0x0302	/* get current unmask setting */
@@ -1077,11 +1077,11 @@ Index: linux/src/include/linux/hdreg.h
  };
  
  #ifdef __KERNEL__
-Index: linux/configfrag.ac
+Index: b/linux/configfrag.ac
 ===================================================================
---- 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],
+--- a/linux/configfrag.ac
++++ b/linux/configfrag.ac
+@@ -140,6 +140,11 @@ AC_Linux_DRIVER_qemu([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 83370cc..7dc6542 100644
--- a/debian/patches/14_alloc_params.patch
+++ b/debian/patches/14_alloc_params.patch
@@ -17,10 +17,10 @@
 	* kern/zalloc.c (zone_map_size): Increase from 12 to 16 MiB.
 
 
-Index: kern/mach_param.h
+Index: b/kern/mach_param.h
 ===================================================================
---- kern/mach_param.h.orig	2001-04-05 09:39:20.000000000 +0300
-+++ kern/mach_param.h	2007-04-05 07:31:10.000000000 +0300
+--- a/kern/mach_param.h
++++ b/kern/mach_param.h
 @@ -38,16 +38,16 @@
  #ifndef	_KERN_MACH_PARAM_H_
  #define _KERN_MACH_PARAM_H_
@@ -42,10 +42,10 @@ Index: kern/mach_param.h
  #define ACTPOOL_CHUNK	64
  
  #define PORT_MAX	((TASK_MAX * 3 + THREAD_MAX)	/* kernel */ \
-Index: kern/zalloc.c
+Index: b/kern/zalloc.c
 ===================================================================
---- kern/zalloc.c.orig	2007-02-11 14:51:17.000000000 +0200
-+++ kern/zalloc.c	2007-04-05 07:31:10.000000000 +0300
+--- a/kern/zalloc.c
++++ b/kern/zalloc.c
 @@ -105,7 +105,7 @@ zone_t		zone_zone;	/* this is the zone c
  boolean_t	zone_ignore_overflow = TRUE;
  
@@ -55,13 +55,10 @@ Index: kern/zalloc.c
  
  /*
   *	The VM system gives us an initial chunk of memory.
-Index: vm/vm_object.c
+Index: b/vm/vm_object.c
 ===================================================================
-RCS file: /cvsroot/hurd/gnumach/vm/vm_object.c,v
-retrieving revision 1.2.4.9
-diff -u -p -r1.2.4.9 vm_object.c
---- vm/vm_object.c	1 Mar 2007 09:46:46 -0000	1.2.4.9
-+++ vm/vm_object.c	20 Aug 2007 00:14:12 -0000
+--- a/vm/vm_object.c
++++ b/vm/vm_object.c
 @@ -179,7 +179,7 @@ vm_object_t	kernel_object;
   */
  queue_head_t	vm_object_cached_list;
@@ -71,9 +68,11 @@ diff -u -p -r1.2.4.9 vm_object.c
  
  decl_simple_lock_data(,vm_object_cached_lock_data)
  
---- linux/dev/glue/block.c.orig	2007-12-30 15:55:04.000000000 +0000
-+++ linux/dev/glue/block.c	2007-12-30 15:55:22.000000000 +0000
-@@ -572,7 +572,7 @@
+Index: b/linux/dev/glue/block.c
+===================================================================
+--- a/linux/dev/glue/block.c
++++ b/linux/dev/glue/block.c
+@@ -572,7 +572,7 @@ out:
  }
  
  #define BH_Bounce	16
@@ -82,9 +81,11 @@ diff -u -p -r1.2.4.9 vm_object.c
  
  /* Perform read/write operation RW on device DEV
     starting at *off to/from buffer *BUF of size *RESID.
---- vm/vm_map.h.orig	2007-12-30 15:56:22.000000000 +0000
-+++ vm/vm_map.h	2007-12-30 15:56:27.000000000 +0000
-@@ -226,7 +226,7 @@
+Index: b/vm/vm_map.h
+===================================================================
+--- a/vm/vm_map.h
++++ b/vm/vm_map.h
+@@ -226,7 +226,7 @@ typedef struct vm_map_version {
   *		(returned) and an abort flag (abort if TRUE).
   */
  
diff --git a/debian/patches/15_mem_obj_proxy.patch b/debian/patches/15_mem_obj_proxy.patch
index ac8a161..303c7ce 100644
--- a/debian/patches/15_mem_obj_proxy.patch
+++ b/debian/patches/15_mem_obj_proxy.patch
@@ -15,10 +15,10 @@
 	objects.
 
 
-Index: i386/include/mach/i386/vm_types.h
+Index: b/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	2007-02-11 15:08:26.000000000 +0200
+--- a/i386/include/mach/i386/vm_types.h
++++ b/i386/include/mach/i386/vm_types.h
 @@ -74,6 +74,7 @@ typedef unsigned int	uint32;
   * e.g. an offset into a virtual memory space.
   */
@@ -27,10 +27,10 @@ Index: i386/include/mach/i386/vm_types.h
  
  /*
   * A vm_size_t is the proper type for e.g.
-Index: include/mach/mach4.defs
+Index: b/include/mach/mach4.defs
 ===================================================================
---- include/mach/mach4.defs.orig	1997-02-25 23:26:51.000000000 +0200
-+++ include/mach/mach4.defs	2007-02-11 15:08:26.000000000 +0200
+--- a/include/mach/mach4.defs
++++ b/include/mach/mach4.defs
 @@ -79,4 +79,34 @@ skip	/* pc_sampling reserved 1*/;
  skip	/* pc_sampling reserved 2*/;
  skip	/* pc_sampling reserved 3*/;
@@ -66,10 +66,10 @@ Index: include/mach/mach4.defs
 +		start		: vm_offset_array_t;
 +		len		: vm_offset_array_t;
 +		out proxy	: mach_port_t);
-Index: include/mach/memory_object.h
+Index: b/include/mach/memory_object.h
 ===================================================================
---- include/mach/memory_object.h.orig	1997-02-25 23:26:52.000000000 +0200
-+++ include/mach/memory_object.h	2007-02-11 15:08:26.000000000 +0200
+--- a/include/mach/memory_object.h
++++ b/include/mach/memory_object.h
 @@ -46,6 +46,9 @@ typedef	mach_port_t	memory_object_t;
  					/*  the object to map; used by the */
  					/*  kernel to retrieve or store data */
@@ -80,10 +80,10 @@ Index: include/mach/memory_object.h
  typedef	mach_port_t	memory_object_control_t;
  					/* Provided to a memory manager; ... */
  					/*  used to control a memory object */
-Index: kern/ipc_kobject.c
+Index: b/kern/ipc_kobject.c
 ===================================================================
---- kern/ipc_kobject.c.orig	2006-11-14 03:58:57.000000000 +0200
-+++ kern/ipc_kobject.c	2007-02-11 15:08:26.000000000 +0200
+--- a/kern/ipc_kobject.c
++++ b/kern/ipc_kobject.c
 @@ -353,6 +353,9 @@ ipc_kobject_notify(request_header, reply
  		case IKOT_DEVICE:
  		return ds_notify(request_header);
@@ -94,10 +94,10 @@ Index: kern/ipc_kobject.c
  		default:
  		return FALSE;
  	}
-Index: kern/ipc_kobject.h
+Index: b/kern/ipc_kobject.h
 ===================================================================
---- kern/ipc_kobject.h.orig	1997-02-25 23:28:22.000000000 +0200
-+++ kern/ipc_kobject.h	2007-02-11 15:08:26.000000000 +0200
+--- a/kern/ipc_kobject.h
++++ b/kern/ipc_kobject.h
 @@ -77,9 +77,10 @@ typedef unsigned int ipc_kobject_type_t;
  #define IKOT_LOCK_SET		24
  #define IKOT_CLOCK		25
@@ -111,10 +111,10 @@ Index: kern/ipc_kobject.h
   /* Please keep ipc/ipc_object.c:ikot_print_array up to date	*/
  
  #define is_ipc_kobject(ikot)	(ikot != IKOT_NONE)
-Index: vm/memory_object_proxy.c
+Index: b/vm/memory_object_proxy.c
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ vm/memory_object_proxy.c	2007-02-11 15:08:26.000000000 +0200
+--- /dev/null
++++ b/vm/memory_object_proxy.c
 @@ -0,0 +1,200 @@
 +/* memory_object_proxy.c - Proxy memory objects for Mach.
 +   Copyright (C) 2005 Free Software Foundation, Inc.
@@ -316,20 +316,20 @@ Index: vm/memory_object_proxy.c
 +
 +  return KERN_SUCCESS;
 +}
-Index: vm/vm_init.c
+Index: b/vm/vm_init.c
 ===================================================================
---- vm/vm_init.c.orig	1997-02-25 23:28:36.000000000 +0200
-+++ vm/vm_init.c	2007-02-11 15:08:26.000000000 +0200
+--- a/vm/vm_init.c
++++ b/vm/vm_init.c
 @@ -81,4 +81,5 @@ void vm_mem_bootstrap()
  void vm_mem_init()
  {
  	vm_object_init();
 +	memory_object_proxy_init();
  }
-Index: vm/vm_user.c
+Index: b/vm/vm_user.c
 ===================================================================
---- vm/vm_user.c.orig	1997-02-25 23:28:37.000000000 +0200
-+++ vm/vm_user.c	2007-02-11 15:08:26.000000000 +0200
+--- a/vm/vm_user.c
++++ b/vm/vm_user.c
 @@ -275,6 +275,12 @@ kern_return_t vm_copy(map, source_addres
  	return KERN_SUCCESS;
  }
@@ -367,10 +367,10 @@ Index: vm/vm_user.c
  
  	/*
  	 *	Perform the copy if requested
-Index: Makefrag.am
+Index: b/Makefrag.am
 ===================================================================
---- Makefrag.am.orig	2007-02-11 14:51:10.000000000 +0200
-+++ Makefrag.am	2007-02-11 15:10:59.000000000 +0200
+--- a/Makefrag.am
++++ b/Makefrag.am
 @@ -214,6 +214,7 @@ libkernel_a_SOURCES += \
  #
  
diff --git a/debian/patches/16_ide_multsect.patch b/debian/patches/16_ide_multsect.patch
index e2d9454..b12f7ff 100644
--- a/debian/patches/16_ide_multsect.patch
+++ b/debian/patches/16_ide_multsect.patch
@@ -1,10 +1,7 @@
-Index: linux/src/drivers/block/ide.h
+Index: b/linux/src/drivers/block/ide.h
 ===================================================================
-RCS file: /cvsroot/hurd/gnumach/linux/src/drivers/block/Attic/ide.h,v
-retrieving revision 1.1
-diff -u -p -r1.1 ide.h
---- linux/src/drivers/block/ide.h	26 Apr 1999 05:51:39 -0000	1.1
-+++ linux/src/drivers/block/ide.h	29 Dec 2007 18:09:54 -0000
+--- a/linux/src/drivers/block/ide.h
++++ b/linux/src/drivers/block/ide.h
 @@ -23,7 +23,7 @@
   * REALLY_SLOW_IO can be defined in ide.c and ide-cd.c, if necessary
   */
diff --git a/debian/patches/20_mmx_support.patch b/debian/patches/20_mmx_support.patch
index 8fb50f0..4931f60 100644
--- a/debian/patches/20_mmx_support.patch
+++ b/debian/patches/20_mmx_support.patch
@@ -23,10 +23,10 @@
 	(fp_state_alloc): Add FXSR-aware initialization.
 
 
-Index: i386/i386/fpu.c
+Index: b/i386/i386/fpu.c
 ===================================================================
---- 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
+--- a/i386/i386/fpu.c
++++ b/i386/i386/fpu.c
 @@ -43,6 +43,7 @@
  #include <i386/thread.h>
  #include <i386/fpu.h>
@@ -306,10 +306,10 @@ Index: i386/i386/fpu.c
  }
  
  #if	AT386
-Index: i386/i386/fpu.h
+Index: b/i386/i386/fpu.h
 ===================================================================
---- 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
+--- a/i386/i386/fpu.h
++++ b/i386/i386/fpu.h
 @@ -66,6 +66,12 @@
  #define	frstor(state) \
  	asm volatile("frstor %0" : : "m" (state))
@@ -335,10 +335,10 @@ Index: i386/i386/fpu.h
  	    set_ts(); \
  	} \
      }
-Index: i386/i386/thread.h
+Index: b/i386/i386/thread.h
 ===================================================================
---- 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
+--- a/i386/i386/thread.h
++++ b/i386/i386/thread.h
 @@ -111,9 +111,14 @@ struct i386_kernel_state {
   */
  
@@ -356,10 +356,10 @@ Index: i386/i386/thread.h
  };
  
  /*
-Index: i386/include/mach/i386/fp_reg.h
+Index: b/i386/include/mach/i386/fp_reg.h
 ===================================================================
---- 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
+--- a/i386/include/mach/i386/fp_reg.h
++++ b/i386/include/mach/i386/fp_reg.h
 @@ -46,10 +46,30 @@ struct i386_fp_save	{
  };
  
@@ -399,10 +399,10 @@ Index: i386/include/mach/i386/fp_reg.h
 +#define	FP_387X		4		/* FXSAVE/RSTOR-capable */
  
  #endif	/* _MACH_I386_FP_REG_H_ */
-Index: i386/include/mach/i386/thread_status.h
+Index: b/i386/include/mach/i386/thread_status.h
 ===================================================================
---- 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
+--- a/i386/include/mach/i386/thread_status.h
++++ b/i386/include/mach/i386/thread_status.h
 @@ -111,7 +111,7 @@ struct i386_thread_state {
  	(sizeof (struct i386_fp_save) + sizeof (struct i386_fp_regs))
  
diff --git a/debian/patches/21_aligned_zalloc.patch b/debian/patches/21_aligned_zalloc.patch
index b63f1c1..bef36f1 100644
--- a/debian/patches/21_aligned_zalloc.patch
+++ b/debian/patches/21_aligned_zalloc.patch
@@ -3,13 +3,10 @@
 	* kern/zalloc.c (zget_space): Align zalloc_next_space again after
 	calling kmem_alloc_wired (which may sleep).
 
-Index: kern/zalloc.c
+Index: b/kern/zalloc.c
 ===================================================================
-RCS file: /cvsroot/hurd/gnumach/kern/zalloc.c,v
-retrieving revision 1.3.2.8
-diff -u -p -r1.3.2.8 zalloc.c
---- kern/zalloc.c	30 Apr 2007 20:30:11 -0000	1.3.2.8
-+++ kern/zalloc.c	3 Sep 2007 23:22:13 -0000
+--- a/kern/zalloc.c
++++ b/kern/zalloc.c
 @@ -320,6 +320,8 @@ static vm_offset_t zget_space(vm_offset_
  			zone_page_init(new_space, space_to_add,
  							ZONE_PAGE_USED);
diff --git a/debian/patches/24_pci_irq_fix.patch b/debian/patches/24_pci_irq_fix.patch
index 21c961c..4f1c0f9 100644
--- a/debian/patches/24_pci_irq_fix.patch
+++ b/debian/patches/24_pci_irq_fix.patch
@@ -20,10 +20,11 @@ the device is not being used for unassigned IRQ.
 	happens in some motherboard).
 
 
-diff -ru gnumach-vanilla/linux/src/drivers/net/pci-scan.c gnumach-irqpciquickfix/linux/src/drivers/net/pci-scan.c
---- gnumach-vanilla/linux/src/drivers/net/pci-scan.c	2006-01-22 16:54:41.000000000 +0100
-+++ gnumach-irqpciquickfix/linux/src/drivers/net/pci-scan.c	2006-01-28 06:19:58.000000000 +0100
-@@ -347,7 +347,7 @@
+Index: b/linux/src/drivers/net/pci-scan.c
+===================================================================
+--- a/linux/src/drivers/net/pci-scan.c
++++ b/linux/src/drivers/net/pci-scan.c
+@@ -347,7 +347,7 @@ int pci_drv_register(struct drv_id_info 
  				   pci_tbl[chip_idx].name, pciaddr, irq);
  
  		if ( ! (pci_flags & PCI_UNUSED_IRQ)  &&
@@ -32,5 +33,3 @@ diff -ru gnumach-vanilla/linux/src/drivers/net/pci-scan.c gnumach-irqpciquickfix
  			if (pci_bus == 32) 	/* Broken CardBus activation. */
  				printk(KERN_WARNING "Resources for CardBus device '%s' have"
  					   " not been allocated.\n"
-
-
diff --git a/debian/patches/30_net_multicast.patch b/debian/patches/30_net_multicast.patch
index 26e83ec..ff4d6d9 100644
--- a/debian/patches/30_net_multicast.patch
+++ b/debian/patches/30_net_multicast.patch
@@ -7,14 +7,10 @@
 	* linux/dev/glue/net.c (device_open): Set LINUX_IFF_ALLMULTI flag
 	on device and propagate.
 
-Index: linux/dev/glue/net.c
+Index: b/linux/dev/glue/net.c
 ===================================================================
-RCS file: /cvsroot/hurd/gnumach/linux/dev/glue/Attic/net.c,v
-retrieving revision 1.1.4.7
-retrieving revision 1.1.4.9
-diff -u -p -r1.1.4.7 -r1.1.4.9
---- linux/dev/glue/net.c	27 Mar 2007 22:47:11 -0000	1.1.4.7
-+++ linux/dev/glue/net.c	9 Oct 2007 07:44:17 -0000	1.1.4.9
+--- a/linux/dev/glue/net.c
++++ b/linux/dev/glue/net.c
 @@ -398,8 +398,14 @@ device_open (ipc_port_t reply_port, mach
  	}
        else
diff --git a/debian/patches/40_iopl_mmap.patch b/debian/patches/40_iopl_mmap.patch
index 9398a45..0dfc340 100644
--- a/debian/patches/40_iopl_mmap.patch
+++ b/debian/patches/40_iopl_mmap.patch
@@ -1,10 +1,7 @@
-Index: i386/Makefrag.am
+Index: b/i386/Makefrag.am
 ===================================================================
-RCS file: /cvsroot/hurd/gnumach/i386/Attic/Makefrag.am,v
-retrieving revision 1.1.2.10
-diff -u -p -r1.1.2.10 Makefrag.am
---- i386/Makefrag.am	7 May 2007 22:04:53 -0000	1.1.2.10
-+++ i386/Makefrag.am	9 May 2007 16:09:12 -0000
+--- a/i386/Makefrag.am
++++ b/i386/Makefrag.am
 @@ -31,6 +31,7 @@ libkernel_a_SOURCES += \
  	i386/i386at/immc.c \
  	i386/i386at/int_init.c \
@@ -13,13 +10,10 @@ diff -u -p -r1.1.2.10 Makefrag.am
  	i386/i386at/kd.c \
  	i386/i386at/kd.h \
  	i386/i386at/kd_event.c \
-Index: i386/i386at/conf.c
+Index: b/i386/i386at/conf.c
 ===================================================================
-RCS file: /cvsroot/hurd/gnumach/i386/i386at/Attic/conf.c,v
-retrieving revision 1.4.2.15
-diff -u -p -r1.4.2.15 conf.c
---- i386/i386at/conf.c	1 Apr 2007 22:10:40 -0000	1.4.2.15
-+++ i386/i386at/conf.c	9 May 2007 16:09:16 -0000
+--- a/i386/i386at/conf.c
++++ b/i386/i386at/conf.c
 @@ -58,6 +58,9 @@ extern int	kbdgetstat(), kbdsetstat();
  extern int	mouseopen(), mouseclose(), mouseread(), mousegetstat();
  #define	mousename		"mouse"
@@ -42,12 +36,10 @@ diff -u -p -r1.4.2.15 conf.c
  #ifdef	MACH_KMSG
          { kmsgname,     kmsgopen,       kmsgclose,       kmsgread,
            nodev,        kmsggetstat,    nodev,           nomap,
-Index: i386/i386at/iopl.c
+Index: b/i386/i386at/iopl.c
 ===================================================================
-RCS file: i386/i386at/iopl.c
-diff -N i386/i386at/iopl.c
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ i386/i386at/iopl.c	9 May 2007 16:09:16 -0000
+--- /dev/null
++++ b/i386/i386at/iopl.c
 @@ -0,0 +1,56 @@
 +/* 
 + * Mach Operating System
diff --git a/debian/patches/50_ide_bm.patch b/debian/patches/50_ide_bm.patch
index bb644aa..982f28b 100644
--- a/debian/patches/50_ide_bm.patch
+++ b/debian/patches/50_ide_bm.patch
@@ -1,13 +1,10 @@
 Enable Bus Mastering if not enabled by BIOS (Bochs' BIOS doesn't).
 
-Index: linux/src/drivers/block/triton.c
+Index: b/linux/src/drivers/block/triton.c
 ===================================================================
-RCS file: /cvsroot/hurd/gnumach/linux/src/drivers/block/Attic/triton.c,v
-retrieving revision 1.1
-diff -u -p -r1.1 triton.c
---- linux/src/drivers/block/triton.c	26 Apr 1999 05:51:41 -0000	1.1
-+++ linux/src/drivers/block/triton.c	6 Feb 2008 11:30:47 -0000
-@@ -632,7 +632,17 @@ void ide_init_triton (byte bus, byte fn)
+--- a/linux/src/drivers/block/triton.c
++++ b/linux/src/drivers/block/triton.c
+@@ -632,7 +632,17 @@ hpt343_jump_in:
  		goto quit;
  	}
  	if ((pcicmd & 4) == 0) {
diff --git a/debian/patches/70_cld.patch b/debian/patches/70_cld.patch
index 1cb6abc..69fdf3c 100644
--- a/debian/patches/70_cld.patch
+++ b/debian/patches/70_cld.patch
@@ -1,11 +1,8 @@
-Index: i386/i386/locore.S
+Index: b/i386/i386/locore.S
 ===================================================================
-RCS file: /cvsroot/hurd/gnumach/i386/i386/locore.S,v
-retrieving revision 1.6.2.11
-diff -u -p -r1.6.2.11 locore.S
---- i386/i386/locore.S	7 Aug 2007 13:07:25 -0000	1.6.2.11
-+++ i386/i386/locore.S	7 Mar 2008 23:17:16 -0000
-@@ -966,6 +966,8 @@ syscall
+--- a/i386/i386/locore.S
++++ b/i386/i386/locore.S
+@@ -960,6 +960,8 @@ ENTRY(syscall)
  syscall_entry:
  	pushf				/* save flags as soon as possible */
  syscall_entry_2:
diff --git a/debian/patches/series b/debian/patches/series
index ccbf871..9e4019e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,16 +1,16 @@
-00_clean_gfdl.patch -p0
-05_halt_on_panic_flag.patch -p0
-10_cdromlock.patch -p0
-12_sis900.patch -p0
-13_ide_dma.patch -p0
-14_alloc_params.patch -p0
-15_mem_obj_proxy.patch -p0
-16_ide_multsect.patch -p0
-20_mmx_support.patch -p0
-21_aligned_zalloc.patch -p0
-24_pci_irq_fix.patch -p1
-30_net_multicast.patch -p0
-40_iopl_mmap.patch -p0
-50_ide_bm.patch -p0
-70_cld.patch -p0
-90_autoconf_autogen.patch 
+00_clean_gfdl.patch
+05_halt_on_panic_flag.patch
+10_cdromlock.patch
+12_sis900.patch
+13_ide_dma.patch
+14_alloc_params.patch
+15_mem_obj_proxy.patch
+16_ide_multsect.patch
+20_mmx_support.patch
+21_aligned_zalloc.patch
+24_pci_irq_fix.patch
+30_net_multicast.patch
+40_iopl_mmap.patch
+50_ide_bm.patch
+70_cld.patch
+90_autoconf_autogen.patch