Update patches for linux 2.6.15.

Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>


--HG--
rename : patches/linux-2.6.14/i386-mach-io-check-nmi.patch => patches/linux-2.6.15/i386-mach-io-check-nmi.patch
rename : patches/linux-2.6.14/net-csum.patch => patches/linux-2.6.15/net-csum.patch
rename : patches/linux-2.6.14/pmd-shared.patch => patches/linux-2.6.15/pmd-shared.patch
rename : patches/linux-2.6.14/smp-alts.patch => patches/linux-2.6.15/smp-alts.patch

4 files changed, 98 insertions, 68 deletions

diff --git a/patches/linux-2.6.14/i386-mach-io-check-nmi.patch b/patches/linux-2.6.15/i386-mach-io-check-nmi.patch
index c42fd9b057..990e358890 100644
--- a/patches/linux-2.6.14/i386-mach-io-check-nmi.patch
+++ b/patches/linux-2.6.15/i386-mach-io-check-nmi.patch
@@ -1,7 +1,7 @@
-diff -pruN ../pristine-linux-2.6.14/arch/i386/kernel/traps.c ./arch/i386/kernel/traps.c
---- ../pristine-linux-2.6.14/arch/i386/kernel/traps.c	2005-10-28 01:02:08.000000000 +0100
-+++ ./arch/i386/kernel/traps.c	2006-01-31 16:15:06.000000000 +0000
-@@ -532,18 +532,11 @@ static void mem_parity_error(unsigned ch
+diff -pruN ../pristine-linux-2.6.15/arch/i386/kernel/traps.c ./arch/i386/kernel/traps.c
+--- ../pristine-linux-2.6.15/arch/i386/kernel/traps.c	2006-01-03 03:21:10.000000000 +0000
++++ ./arch/i386/kernel/traps.c	2006-02-02 17:14:26.000000000 +0000
+@@ -533,18 +533,11 @@ static void mem_parity_error(unsigned ch
  
  static void io_check_error(unsigned char reason, struct pt_regs * regs)
  {
@@ -21,9 +21,9 @@ diff -pruN ../pristine-linux-2.6.14/arch/i386/kernel/traps.c ./arch/i386/kernel/
  }
  
  static void unknown_nmi_error(unsigned char reason, struct pt_regs * regs)
-diff -pruN ../pristine-linux-2.6.14/include/asm-i386/mach-default/mach_traps.h ./include/asm-i386/mach-default/mach_traps.h
---- ../pristine-linux-2.6.14/include/asm-i386/mach-default/mach_traps.h	2005-10-28 01:02:08.000000000 +0100
-+++ ./include/asm-i386/mach-default/mach_traps.h	2006-01-31 16:15:06.000000000 +0000
+diff -pruN ../pristine-linux-2.6.15/include/asm-i386/mach-default/mach_traps.h ./include/asm-i386/mach-default/mach_traps.h
+--- ../pristine-linux-2.6.15/include/asm-i386/mach-default/mach_traps.h	2006-01-03 03:21:10.000000000 +0000
++++ ./include/asm-i386/mach-default/mach_traps.h	2006-02-02 17:14:26.000000000 +0000
 @@ -15,6 +15,18 @@ static inline void clear_mem_error(unsig
  	outb(reason, 0x61);
  }
diff --git a/patches/linux-2.6.14/net-csum.patch b/patches/linux-2.6.15/net-csum.patch
index 78fe073427..9a5e62aeb3 100644
--- a/patches/linux-2.6.14/net-csum.patch
+++ b/patches/linux-2.6.15/net-csum.patch
@@ -1,6 +1,6 @@
-diff -pruN ../pristine-linux-2.6.14/net/ipv4/netfilter/ip_nat_proto_tcp.c ./net/ipv4/netfilter/ip_nat_proto_tcp.c
---- ../pristine-linux-2.6.14/net/ipv4/netfilter/ip_nat_proto_tcp.c	2005-10-28 01:02:08.000000000 +0100
-+++ ./net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-01-31 16:15:46.000000000 +0000
+diff -pruN ../pristine-linux-2.6.15/net/ipv4/netfilter/ip_nat_proto_tcp.c ./net/ipv4/netfilter/ip_nat_proto_tcp.c
+--- ../pristine-linux-2.6.15/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-01-03 03:21:10.000000000 +0000
++++ ./net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-02-02 17:14:59.000000000 +0000
 @@ -129,10 +129,16 @@ tcp_manip_pkt(struct sk_buff **pskb,
  	if (hdrsize < sizeof(*hdr))
  		return 1;
@@ -19,9 +19,9 @@ diff -pruN ../pristine-linux-2.6.14/net/ipv4/netfilter/ip_nat_proto_tcp.c ./net/
  	return 1;
  }
  
-diff -pruN ../pristine-linux-2.6.14/net/ipv4/netfilter/ip_nat_proto_udp.c ./net/ipv4/netfilter/ip_nat_proto_udp.c
---- ../pristine-linux-2.6.14/net/ipv4/netfilter/ip_nat_proto_udp.c	2005-10-28 01:02:08.000000000 +0100
-+++ ./net/ipv4/netfilter/ip_nat_proto_udp.c	2006-01-31 16:15:46.000000000 +0000
+diff -pruN ../pristine-linux-2.6.15/net/ipv4/netfilter/ip_nat_proto_udp.c ./net/ipv4/netfilter/ip_nat_proto_udp.c
+--- ../pristine-linux-2.6.15/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-01-03 03:21:10.000000000 +0000
++++ ./net/ipv4/netfilter/ip_nat_proto_udp.c	2006-02-02 17:14:59.000000000 +0000
 @@ -113,11 +113,19 @@ udp_manip_pkt(struct sk_buff **pskb,
  		newport = tuple->dst.u.udp.port;
  		portptr = &hdr->dest;
diff --git a/patches/linux-2.6.14/pmd-shared.patch b/patches/linux-2.6.15/pmd-shared.patch
index 017ef168c3..053e987fdb 100644
--- a/patches/linux-2.6.14/pmd-shared.patch
+++ b/patches/linux-2.6.15/pmd-shared.patch
@@ -1,6 +1,6 @@
-diff -pru ../pristine-linux-2.6.14/arch/i386/mm/pageattr.c ./arch/i386/mm/pageattr.c
---- ../pristine-linux-2.6.14/arch/i386/mm/pageattr.c	2005-10-28 01:02:08.000000000 +0100
-+++ ./arch/i386/mm/pageattr.c	2006-01-31 15:49:38.000000000 +0000
+diff -pruN ../pristine-linux-2.6.15/arch/i386/mm/pageattr.c ./arch/i386/mm/pageattr.c
+--- ../pristine-linux-2.6.15/arch/i386/mm/pageattr.c	2006-01-03 03:21:10.000000000 +0000
++++ ./arch/i386/mm/pageattr.c	2006-02-02 17:15:14.000000000 +0000
 @@ -76,7 +76,7 @@ static void set_pmd_pte(pte_t *kpte, uns
  	unsigned long flags;
  
@@ -10,10 +10,10 @@ diff -pru ../pristine-linux-2.6.14/arch/i386/mm/pageattr.c ./arch/i386/mm/pageat
  		return;
  
  	spin_lock_irqsave(&pgd_lock, flags);
-diff -pru ../pristine-linux-2.6.14/arch/i386/mm/pgtable.c ./arch/i386/mm/pgtable.c
---- ../pristine-linux-2.6.14/arch/i386/mm/pgtable.c	2005-10-28 01:02:08.000000000 +0100
-+++ ./arch/i386/mm/pgtable.c	2006-01-31 15:56:50.000000000 +0000
-@@ -212,9 +212,10 @@ void pgd_ctor(void *pgd, kmem_cache_t *c
+diff -pruN ../pristine-linux-2.6.15/arch/i386/mm/pgtable.c ./arch/i386/mm/pgtable.c
+--- ../pristine-linux-2.6.15/arch/i386/mm/pgtable.c	2006-01-03 03:21:10.000000000 +0000
++++ ./arch/i386/mm/pgtable.c	2006-02-02 17:15:14.000000000 +0000
+@@ -215,9 +215,10 @@ void pgd_ctor(void *pgd, kmem_cache_t *c
  		spin_lock_irqsave(&pgd_lock, flags);
  	}
  
@@ -27,7 +27,7 @@ diff -pru ../pristine-linux-2.6.14/arch/i386/mm/pgtable.c ./arch/i386/mm/pgtable
  	if (PTRS_PER_PMD > 1)
  		return;
  
-@@ -246,6 +247,30 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
+@@ -249,6 +250,30 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
  			goto out_oom;
  		set_pgd(&pgd[i], __pgd(1 + __pa(pmd)));
  	}
@@ -58,7 +58,7 @@ diff -pru ../pristine-linux-2.6.14/arch/i386/mm/pgtable.c ./arch/i386/mm/pgtable
  	return pgd;
  
  out_oom:
-@@ -260,9 +285,23 @@ void pgd_free(pgd_t *pgd)
+@@ -263,9 +288,23 @@ void pgd_free(pgd_t *pgd)
  	int i;
  
  	/* in the PAE case user pgd entries are overwritten before usage */
@@ -85,9 +85,9 @@ diff -pru ../pristine-linux-2.6.14/arch/i386/mm/pgtable.c ./arch/i386/mm/pgtable
  	/* in the non-PAE case, free_pgtables() clears user pgd entries */
  	kmem_cache_free(pgd_cache, pgd);
  }
-diff -pru ../pristine-linux-2.6.14/include/asm-i386/pgtable-2level-defs.h ./include/asm-i386/pgtable-2level-defs.h
---- ../pristine-linux-2.6.14/include/asm-i386/pgtable-2level-defs.h	2005-10-28 01:02:08.000000000 +0100
-+++ ./include/asm-i386/pgtable-2level-defs.h	2006-01-31 15:49:38.000000000 +0000
+diff -pruN ../pristine-linux-2.6.15/include/asm-i386/pgtable-2level-defs.h ./include/asm-i386/pgtable-2level-defs.h
+--- ../pristine-linux-2.6.15/include/asm-i386/pgtable-2level-defs.h	2006-01-03 03:21:10.000000000 +0000
++++ ./include/asm-i386/pgtable-2level-defs.h	2006-02-02 17:15:14.000000000 +0000
 @@ -1,6 +1,8 @@
  #ifndef _I386_PGTABLE_2LEVEL_DEFS_H
  #define _I386_PGTABLE_2LEVEL_DEFS_H
@@ -97,9 +97,9 @@ diff -pru ../pristine-linux-2.6.14/include/asm-i386/pgtable-2level-defs.h ./incl
  /*
   * traditional i386 two-level paging structure:
   */
-diff -pru ../pristine-linux-2.6.14/include/asm-i386/pgtable-3level-defs.h ./include/asm-i386/pgtable-3level-defs.h
---- ../pristine-linux-2.6.14/include/asm-i386/pgtable-3level-defs.h	2005-10-28 01:02:08.000000000 +0100
-+++ ./include/asm-i386/pgtable-3level-defs.h	2006-01-31 15:49:38.000000000 +0000
+diff -pruN ../pristine-linux-2.6.15/include/asm-i386/pgtable-3level-defs.h ./include/asm-i386/pgtable-3level-defs.h
+--- ../pristine-linux-2.6.15/include/asm-i386/pgtable-3level-defs.h	2006-01-03 03:21:10.000000000 +0000
++++ ./include/asm-i386/pgtable-3level-defs.h	2006-02-02 17:15:14.000000000 +0000
 @@ -1,6 +1,8 @@
  #ifndef _I386_PGTABLE_3LEVEL_DEFS_H
  #define _I386_PGTABLE_3LEVEL_DEFS_H
diff --git a/patches/linux-2.6.14/smp-alts.patch b/patches/linux-2.6.15/smp-alts.patch
index e152e7fb6a..9389616848 100644
--- a/patches/linux-2.6.14/smp-alts.patch
+++ b/patches/linux-2.6.15/smp-alts.patch
@@ -1,7 +1,7 @@
-diff -pruN ../pristine-linux-2.6.14/arch/i386/Kconfig ./arch/i386/Kconfig
---- ../pristine-linux-2.6.14/arch/i386/Kconfig	2005-10-28 01:02:08.000000000 +0100
-+++ ./arch/i386/Kconfig	2006-01-31 16:05:37.000000000 +0000
-@@ -495,6 +495,19 @@ config SMP
+diff -pruN ../pristine-linux-2.6.15/arch/i386/Kconfig ./arch/i386/Kconfig
+--- ../pristine-linux-2.6.15/arch/i386/Kconfig	2006-01-03 03:21:10.000000000 +0000
++++ ./arch/i386/Kconfig	2006-02-02 17:09:58.000000000 +0000
+@@ -202,6 +202,19 @@ config SMP
  
  	  If you don't know what to do here, say N.
  
@@ -21,9 +21,9 @@ diff -pruN ../pristine-linux-2.6.14/arch/i386/Kconfig ./arch/i386/Kconfig
  config NR_CPUS
  	int "Maximum number of CPUs (2-255)"
  	range 2 255
-diff -pruN ../pristine-linux-2.6.14/arch/i386/kernel/Makefile ./arch/i386/kernel/Makefile
---- ../pristine-linux-2.6.14/arch/i386/kernel/Makefile	2005-10-28 01:02:08.000000000 +0100
-+++ ./arch/i386/kernel/Makefile	2006-01-31 16:05:37.000000000 +0000
+diff -pruN ../pristine-linux-2.6.15/arch/i386/kernel/Makefile ./arch/i386/kernel/Makefile
+--- ../pristine-linux-2.6.15/arch/i386/kernel/Makefile	2006-01-03 03:21:10.000000000 +0000
++++ ./arch/i386/kernel/Makefile	2006-02-02 17:09:58.000000000 +0000
 @@ -34,6 +34,7 @@ obj-$(CONFIG_ACPI_SRAT) 	+= srat.o
  obj-$(CONFIG_HPET_TIMER) 	+= time_hpet.o
  obj-$(CONFIG_EFI) 		+= efi.o efi_stub.o
@@ -32,9 +32,9 @@ diff -pruN ../pristine-linux-2.6.14/arch/i386/kernel/Makefile ./arch/i386/kernel
  
  EXTRA_AFLAGS   := -traditional
  
-diff -pruN ../pristine-linux-2.6.14/arch/i386/kernel/smpalts.c ./arch/i386/kernel/smpalts.c
---- ../pristine-linux-2.6.14/arch/i386/kernel/smpalts.c	1970-01-01 01:00:00.000000000 +0100
-+++ ./arch/i386/kernel/smpalts.c	2006-01-31 16:05:37.000000000 +0000
+diff -pruN ../pristine-linux-2.6.15/arch/i386/kernel/smpalts.c ./arch/i386/kernel/smpalts.c
+--- ../pristine-linux-2.6.15/arch/i386/kernel/smpalts.c	1970-01-01 01:00:00.000000000 +0100
++++ ./arch/i386/kernel/smpalts.c	2006-02-02 17:09:58.000000000 +0000
 @@ -0,0 +1,85 @@
 +#include <linux/kernel.h>
 +#include <asm/system.h>
@@ -121,10 +121,10 @@ diff -pruN ../pristine-linux-2.6.14/arch/i386/kernel/smpalts.c ./arch/i386/kerne
 +	asm volatile ("jmp 1f\n1:");
 +	mb();
 +}
-diff -pruN ../pristine-linux-2.6.14/arch/i386/kernel/smpboot.c ./arch/i386/kernel/smpboot.c
---- ../pristine-linux-2.6.14/arch/i386/kernel/smpboot.c	2005-10-28 01:02:08.000000000 +0100
-+++ ./arch/i386/kernel/smpboot.c	2006-01-31 16:06:47.000000000 +0000
-@@ -1185,6 +1185,11 @@ static void __init smp_boot_cpus(unsigne
+diff -pruN ../pristine-linux-2.6.15/arch/i386/kernel/smpboot.c ./arch/i386/kernel/smpboot.c
+--- ../pristine-linux-2.6.15/arch/i386/kernel/smpboot.c	2006-01-03 03:21:10.000000000 +0000
++++ ./arch/i386/kernel/smpboot.c	2006-02-02 17:09:58.000000000 +0000
+@@ -1212,6 +1212,11 @@ static void __init smp_boot_cpus(unsigne
  		if (max_cpus <= cpucount+1)
  			continue;
  
@@ -136,7 +136,7 @@ diff -pruN ../pristine-linux-2.6.14/arch/i386/kernel/smpboot.c ./arch/i386/kerne
  		if (((cpu = alloc_cpu_id()) <= 0) || do_boot_cpu(apicid, cpu))
  			printk("CPU #%d not responding - cannot use it.\n",
  								apicid);
-@@ -1355,6 +1360,11 @@ int __devinit __cpu_up(unsigned int cpu)
+@@ -1390,6 +1395,11 @@ int __devinit __cpu_up(unsigned int cpu)
  		return -EIO;
  	}
  
@@ -148,9 +148,9 @@ diff -pruN ../pristine-linux-2.6.14/arch/i386/kernel/smpboot.c ./arch/i386/kerne
  	local_irq_enable();
  	per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
  	/* Unleash the CPU! */
-diff -pruN ../pristine-linux-2.6.14/arch/i386/kernel/vmlinux.lds.S ./arch/i386/kernel/vmlinux.lds.S
---- ../pristine-linux-2.6.14/arch/i386/kernel/vmlinux.lds.S	2005-10-28 01:02:08.000000000 +0100
-+++ ./arch/i386/kernel/vmlinux.lds.S	2006-01-31 16:05:37.000000000 +0000
+diff -pruN ../pristine-linux-2.6.15/arch/i386/kernel/vmlinux.lds.S ./arch/i386/kernel/vmlinux.lds.S
+--- ../pristine-linux-2.6.15/arch/i386/kernel/vmlinux.lds.S	2006-01-03 03:21:10.000000000 +0000
++++ ./arch/i386/kernel/vmlinux.lds.S	2006-02-02 17:09:58.000000000 +0000
 @@ -34,6 +34,13 @@ SECTIONS
    __ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) { *(__ex_table) }
    __stop___ex_table = .;
@@ -165,9 +165,9 @@ diff -pruN ../pristine-linux-2.6.14/arch/i386/kernel/vmlinux.lds.S ./arch/i386/k
    RODATA
  
    /* writeable */
-diff -pruN ../pristine-linux-2.6.14/include/asm-i386/atomic.h ./include/asm-i386/atomic.h
---- ../pristine-linux-2.6.14/include/asm-i386/atomic.h	2005-10-28 01:02:08.000000000 +0100
-+++ ./include/asm-i386/atomic.h	2006-01-31 16:05:37.000000000 +0000
+diff -pruN ../pristine-linux-2.6.15/include/asm-i386/atomic.h ./include/asm-i386/atomic.h
+--- ../pristine-linux-2.6.15/include/asm-i386/atomic.h	2006-01-03 03:21:10.000000000 +0000
++++ ./include/asm-i386/atomic.h	2006-02-02 17:09:58.000000000 +0000
 @@ -4,18 +4,13 @@
  #include <linux/config.h>
  #include <linux/compiler.h>
@@ -188,9 +188,9 @@ diff -pruN ../pristine-linux-2.6.14/include/asm-i386/atomic.h ./include/asm-i386
  /*
   * Make sure gcc doesn't try to be clever and move things around
   * on us. We need to use _exactly_ the address the user gave us,
-diff -pruN ../pristine-linux-2.6.14/include/asm-i386/bitops.h ./include/asm-i386/bitops.h
---- ../pristine-linux-2.6.14/include/asm-i386/bitops.h	2005-10-28 01:02:08.000000000 +0100
-+++ ./include/asm-i386/bitops.h	2006-01-31 16:05:37.000000000 +0000
+diff -pruN ../pristine-linux-2.6.15/include/asm-i386/bitops.h ./include/asm-i386/bitops.h
+--- ../pristine-linux-2.6.15/include/asm-i386/bitops.h	2006-01-03 03:21:10.000000000 +0000
++++ ./include/asm-i386/bitops.h	2006-02-02 17:09:58.000000000 +0000
 @@ -7,6 +7,7 @@
  
  #include <linux/config.h>
@@ -266,9 +266,30 @@ diff -pruN ../pristine-linux-2.6.14/include/asm-i386/bitops.h ./include/asm-i386
  		"btcl %2,%1\n\tsbbl %0,%0"
  		:"=r" (oldbit),"=m" (ADDR)
  		:"Ir" (nr) : "memory");
-diff -pruN ../pristine-linux-2.6.14/include/asm-i386/rwsem.h ./include/asm-i386/rwsem.h
---- ../pristine-linux-2.6.14/include/asm-i386/rwsem.h	2005-10-28 01:02:08.000000000 +0100
-+++ ./include/asm-i386/rwsem.h	2006-01-31 16:05:37.000000000 +0000
+diff -pruN ../pristine-linux-2.6.15/include/asm-i386/futex.h ./include/asm-i386/futex.h
+--- ../pristine-linux-2.6.15/include/asm-i386/futex.h	2006-01-03 03:21:10.000000000 +0000
++++ ./include/asm-i386/futex.h	2006-02-02 17:12:29.000000000 +0000
+@@ -28,7 +28,7 @@
+ "1:	movl	%2, %0\n\
+ 	movl	%0, %3\n"					\
+ 	insn "\n"						\
+-"2:	" LOCK_PREFIX "cmpxchgl %3, %2\n\
++"2:	" LOCK "cmpxchgl %3, %2\n\
+ 	jnz	1b\n\
+ 3:	.section .fixup,\"ax\"\n\
+ 4:	mov	%5, %1\n\
+@@ -68,7 +68,7 @@ futex_atomic_op_inuser (int encoded_op, 
+ #endif
+ 		switch (op) {
+ 		case FUTEX_OP_ADD:
+-			__futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret,
++			__futex_atomic_op1(LOCK "xaddl %0, %2", ret,
+ 					   oldval, uaddr, oparg);
+ 			break;
+ 		case FUTEX_OP_OR:
+diff -pruN ../pristine-linux-2.6.15/include/asm-i386/rwsem.h ./include/asm-i386/rwsem.h
+--- ../pristine-linux-2.6.15/include/asm-i386/rwsem.h	2006-01-03 03:21:10.000000000 +0000
++++ ./include/asm-i386/rwsem.h	2006-02-02 17:09:58.000000000 +0000
 @@ -40,6 +40,7 @@
  
  #include <linux/list.h>
@@ -349,9 +370,9 @@ diff -pruN ../pristine-linux-2.6.14/include/asm-i386/rwsem.h ./include/asm-i386/
  		: "+r"(tmp), "=m"(sem->count)
  		: "r"(sem), "m"(sem->count)
  		: "memory");
-diff -pruN ../pristine-linux-2.6.14/include/asm-i386/smp_alt.h ./include/asm-i386/smp_alt.h
---- ../pristine-linux-2.6.14/include/asm-i386/smp_alt.h	1970-01-01 01:00:00.000000000 +0100
-+++ ./include/asm-i386/smp_alt.h	2006-01-31 16:05:37.000000000 +0000
+diff -pruN ../pristine-linux-2.6.15/include/asm-i386/smp_alt.h ./include/asm-i386/smp_alt.h
+--- ../pristine-linux-2.6.15/include/asm-i386/smp_alt.h	1970-01-01 01:00:00.000000000 +0100
++++ ./include/asm-i386/smp_alt.h	2006-02-02 17:09:58.000000000 +0000
 @@ -0,0 +1,32 @@
 +#ifndef __ASM_SMP_ALT_H__
 +#define __ASM_SMP_ALT_H__
@@ -385,9 +406,9 @@ diff -pruN ../pristine-linux-2.6.14/include/asm-i386/smp_alt.h ./include/asm-i38
 +#endif
 +
 +#endif /* __ASM_SMP_ALT_H__ */
-diff -pruN ../pristine-linux-2.6.14/include/asm-i386/spinlock.h ./include/asm-i386/spinlock.h
---- ../pristine-linux-2.6.14/include/asm-i386/spinlock.h	2005-10-28 01:02:08.000000000 +0100
-+++ ./include/asm-i386/spinlock.h	2006-01-31 16:09:52.000000000 +0000
+diff -pruN ../pristine-linux-2.6.15/include/asm-i386/spinlock.h ./include/asm-i386/spinlock.h
+--- ../pristine-linux-2.6.15/include/asm-i386/spinlock.h	2006-01-03 03:21:10.000000000 +0000
++++ ./include/asm-i386/spinlock.h	2006-02-02 17:09:58.000000000 +0000
 @@ -6,6 +6,7 @@
  #include <asm/page.h>
  #include <linux/config.h>
@@ -467,9 +488,9 @@ diff -pruN ../pristine-linux-2.6.14/include/asm-i386/spinlock.h ./include/asm-i3
  				 : "=m" (rw->lock) : : "memory");
  }
  
-diff -pruN ../pristine-linux-2.6.14/include/asm-i386/system.h ./include/asm-i386/system.h
---- ../pristine-linux-2.6.14/include/asm-i386/system.h	2005-10-28 01:02:08.000000000 +0100
-+++ ./include/asm-i386/system.h	2006-01-31 16:05:37.000000000 +0000
+diff -pruN ../pristine-linux-2.6.15/include/asm-i386/system.h ./include/asm-i386/system.h
+--- ../pristine-linux-2.6.15/include/asm-i386/system.h	2006-01-03 03:21:10.000000000 +0000
++++ ./include/asm-i386/system.h	2006-02-02 17:10:47.000000000 +0000
 @@ -5,7 +5,7 @@
  #include <linux/kernel.h>
  #include <asm/segment.h>
@@ -479,7 +500,7 @@ diff -pruN ../pristine-linux-2.6.14/include/asm-i386/system.h ./include/asm-i386
  
  #ifdef __KERNEL__
  
-@@ -267,19 +267,19 @@ static inline unsigned long __cmpxchg(vo
+@@ -274,19 +274,19 @@ static inline unsigned long __cmpxchg(vo
  	unsigned long prev;
  	switch (size) {
  	case 1:
@@ -493,16 +514,25 @@ diff -pruN ../pristine-linux-2.6.14/include/asm-i386/system.h ./include/asm-i386
 -		__asm__ __volatile__(LOCK_PREFIX "cmpxchgw %w1,%2"
 +		__asm__ __volatile__(LOCK "cmpxchgw %w1,%2"
  				     : "=a"(prev)
- 				     : "q"(new), "m"(*__xg(ptr)), "0"(old)
+ 				     : "r"(new), "m"(*__xg(ptr)), "0"(old)
  				     : "memory");
  		return prev;
  	case 4:
 -		__asm__ __volatile__(LOCK_PREFIX "cmpxchgl %1,%2"
 +		__asm__ __volatile__(LOCK "cmpxchgl %1,%2"
  				     : "=a"(prev)
- 				     : "q"(new), "m"(*__xg(ptr)), "0"(old)
+ 				     : "r"(new), "m"(*__xg(ptr)), "0"(old)
  				     : "memory");
-@@ -443,11 +443,55 @@ struct alt_instr { 
+@@ -339,7 +339,7 @@ static inline unsigned long long __cmpxc
+ 				      unsigned long long new)
+ {
+ 	unsigned long long prev;
+-	__asm__ __volatile__(LOCK_PREFIX "cmpxchg8b %3"
++	__asm__ __volatile__(LOCK "cmpxchg8b %3"
+ 			     : "=A"(prev)
+ 			     : "b"((unsigned long)new),
+ 			       "c"((unsigned long)(new >> 32)),
+@@ -506,11 +506,55 @@ struct alt_instr { 
  #endif
  
  #ifdef CONFIG_SMP