Update to Linux 2.6.16.

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


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

8 files changed, 78 insertions, 82 deletions

diff --git a/buildconfigs/Rules.mk b/buildconfigs/Rules.mk
index 84a341c177..e4cb40def8 100644
--- a/buildconfigs/Rules.mk
+++ b/buildconfigs/Rules.mk
@@ -70,7 +70,7 @@ pristine-%/.valid-pristine: %.tar.bz2
 	rm -rf tmp-pristine-$* $(@D)
 	mkdir -p tmp-pristine-$*
 	tar -C tmp-pristine-$* -jxf $<
-	-@rm tmp-pristine-$*/pax_global_header
+	-@rm -f tmp-pristine-$*/pax_global_header
 	mv tmp-pristine-$*/* $(@D)
 	@rm -rf tmp-pristine-$*
 	touch $(@D)/.hgskip
diff --git a/buildconfigs/mk.linux-2.6-xen b/buildconfigs/mk.linux-2.6-xen
index 803ea85cc3..69b3f5b554 100644
--- a/buildconfigs/mk.linux-2.6-xen
+++ b/buildconfigs/mk.linux-2.6-xen
@@ -2,9 +2,8 @@
 OS           = linux
 
 LINUX_SERIES = 2.6
-LINUX_VER    = 2.6.16-rc6
-LINUX_SRCS = linux-2.6.15.tar.bz2 patch-2.6.16-rc6.bz2
-LINUX_PDIR = linux-$(LINUX_VER)
+LINUX_VER    = 2.6.16
+LINUX_SRCS = linux-2.6.16.tar.bz2
 
 EXTRAVERSION ?= xen
 
@@ -23,20 +22,6 @@ build: $(LINUX_DIR)/include/linux/autoconf.h
 	$(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) INSTALL_PATH=$(DESTDIR) vmlinuz
 	$(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) INSTALL_PATH=$(DESTDIR) install
 
-pristine-$(LINUX_PDIR)/.valid-srcs: $(LINUX_SRCS)
-	rm -rf tmp-pristine-$(LINUX_PDIR) $(@D)
-	mkdir -p tmp-pristine-$(LINUX_PDIR)
-	tar -C tmp-pristine-$(LINUX_PDIR) -jxf $<
-	-@rm tmp-pristine-$(LINUX_PDIR)/pax_global_header
-	mv tmp-pristine-$(LINUX_PDIR)/* $(@D)
-	@rm -rf tmp-pristine-$(LINUX_PDIR)
-	bzcat $(wordlist 2,$(words $^),$^) | patch -d $(@D) -p1
-	touch $(@D)/.hgskip
-	touch $@
-
-pristine-linux-%.16-rc6/.valid-pristine: pristine-$(LINUX_PDIR)/.valid-srcs
-	touch $@ # update timestamp to avoid rebuild
-
 $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref
 	rm -rf $(LINUX_DIR)
 	cp -al $(<D) $(LINUX_DIR)
diff --git a/linux-2.6-xen-sparse/arch/i386/kernel/smpboot.c b/linux-2.6-xen-sparse/arch/i386/kernel/smpboot.c
index 378708c434..1008255c62 100644
--- a/linux-2.6-xen-sparse/arch/i386/kernel/smpboot.c
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/smpboot.c
@@ -1029,6 +1029,16 @@ int __devinit smp_prepare_cpu(int cpu)
 	int	apicid, ret;
 
 	lock_cpu_hotplug();
+
+	/*
+	 * On x86, CPU0 is never offlined.  Trying to bring up an
+	 * already-booted CPU will hang.  So check for that case.
+	 */
+	if (cpu_online(cpu)) {
+		ret = -EINVAL;
+		goto exit;
+	}
+
 	apicid = x86_cpu_to_apicid[cpu];
 	if (apicid == BAD_APICID) {
 		ret = -ENODEV;
diff --git a/linux-2.6-xen-sparse/mm/memory.c b/linux-2.6-xen-sparse/mm/memory.c
index 351b31624e..103c724be1 100644
--- a/linux-2.6-xen-sparse/mm/memory.c
+++ b/linux-2.6-xen-sparse/mm/memory.c
@@ -624,11 +624,12 @@ static unsigned long zap_pte_range(struct mmu_gather *tlb,
 			(*zap_work)--;
 			continue;
 		}
+
+		(*zap_work) -= PAGE_SIZE;
+
 		if (pte_present(ptent)) {
 			struct page *page;
 
-			(*zap_work) -= PAGE_SIZE;
-
 			page = vm_normal_page(vma, addr, ptent);
 			if (unlikely(details) && page) {
 				/*
diff --git a/patches/linux-2.6.16-rc6/i386-mach-io-check-nmi.patch b/patches/linux-2.6.16/i386-mach-io-check-nmi.patch
index 0a8eb60bb0..874d0a2b15 100644
--- a/patches/linux-2.6.16-rc6/i386-mach-io-check-nmi.patch
+++ b/patches/linux-2.6.16/i386-mach-io-check-nmi.patch
@@ -1,6 +1,6 @@
-diff -pruN ../pristine-linux-2.6.16-rc6/arch/i386/kernel/traps.c ./arch/i386/kernel/traps.c
---- ../pristine-linux-2.6.16-rc6/arch/i386/kernel/traps.c	2006-03-17 22:59:01.000000000 +0000
-+++ ./arch/i386/kernel/traps.c	2006-03-17 23:04:16.000000000 +0000
+diff -pruN ../pristine-linux-2.6.16/arch/i386/kernel/traps.c ./arch/i386/kernel/traps.c
+--- ../pristine-linux-2.6.16/arch/i386/kernel/traps.c	2006-03-20 05:53:29.000000000 +0000
++++ ./arch/i386/kernel/traps.c	2006-03-20 19:38:17.000000000 +0000
 @@ -567,18 +567,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.16-rc6/arch/i386/kernel/traps.c ./arch/i386/ker
  }
  
  static void unknown_nmi_error(unsigned char reason, struct pt_regs * regs)
-diff -pruN ../pristine-linux-2.6.16-rc6/include/asm-i386/mach-default/mach_traps.h ./include/asm-i386/mach-default/mach_traps.h
---- ../pristine-linux-2.6.16-rc6/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-03-17 23:04:16.000000000 +0000
+diff -pruN ../pristine-linux-2.6.16/include/asm-i386/mach-default/mach_traps.h ./include/asm-i386/mach-default/mach_traps.h
+--- ../pristine-linux-2.6.16/include/asm-i386/mach-default/mach_traps.h	2006-03-20 05:53:29.000000000 +0000
++++ ./include/asm-i386/mach-default/mach_traps.h	2006-03-20 19:38:17.000000000 +0000
 @@ -15,6 +15,18 @@ static inline void clear_mem_error(unsig
  	outb(reason, 0x61);
  }
diff --git a/patches/linux-2.6.16-rc6/net-csum.patch b/patches/linux-2.6.16/net-csum.patch
index 19f9149457..d6ede6b258 100644
--- a/patches/linux-2.6.16-rc6/net-csum.patch
+++ b/patches/linux-2.6.16/net-csum.patch
@@ -1,6 +1,6 @@
-diff -pruN ../pristine-linux-2.6.16-rc6/net/ipv4/netfilter/ip_nat_proto_tcp.c ./net/ipv4/netfilter/ip_nat_proto_tcp.c
---- ../pristine-linux-2.6.16-rc6/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-03-17 22:59:16.000000000 +0000
-+++ ./net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-03-17 23:04:19.000000000 +0000
+diff -pruN ../pristine-linux-2.6.16/net/ipv4/netfilter/ip_nat_proto_tcp.c ./net/ipv4/netfilter/ip_nat_proto_tcp.c
+--- ../pristine-linux-2.6.16/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-03-20 05:53:29.000000000 +0000
++++ ./net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-03-20 19:38:19.000000000 +0000
 @@ -129,10 +129,14 @@ tcp_manip_pkt(struct sk_buff **pskb,
  	if (hdrsize < sizeof(*hdr))
  		return 1;
@@ -17,9 +17,9 @@ diff -pruN ../pristine-linux-2.6.16-rc6/net/ipv4/netfilter/ip_nat_proto_tcp.c ./
  	return 1;
  }
  
-diff -pruN ../pristine-linux-2.6.16-rc6/net/ipv4/netfilter/ip_nat_proto_udp.c ./net/ipv4/netfilter/ip_nat_proto_udp.c
---- ../pristine-linux-2.6.16-rc6/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-03-17 22:59:16.000000000 +0000
-+++ ./net/ipv4/netfilter/ip_nat_proto_udp.c	2006-03-17 23:04:19.000000000 +0000
+diff -pruN ../pristine-linux-2.6.16/net/ipv4/netfilter/ip_nat_proto_udp.c ./net/ipv4/netfilter/ip_nat_proto_udp.c
+--- ../pristine-linux-2.6.16/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-03-20 05:53:29.000000000 +0000
++++ ./net/ipv4/netfilter/ip_nat_proto_udp.c	2006-03-20 19:38:19.000000000 +0000
 @@ -113,11 +113,16 @@ udp_manip_pkt(struct sk_buff **pskb,
  		newport = tuple->dst.u.udp.port;
  		portptr = &hdr->dest;
diff --git a/patches/linux-2.6.16-rc6/pmd-shared.patch b/patches/linux-2.6.16/pmd-shared.patch
index d190356a97..7ceba997ba 100644
--- a/patches/linux-2.6.16-rc6/pmd-shared.patch
+++ b/patches/linux-2.6.16/pmd-shared.patch
@@ -1,6 +1,6 @@
-diff -pruN ../pristine-linux-2.6.16-rc6/arch/i386/mm/pageattr.c ./arch/i386/mm/pageattr.c
---- ../pristine-linux-2.6.16-rc6/arch/i386/mm/pageattr.c	2006-03-17 22:59:01.000000000 +0000
-+++ ./arch/i386/mm/pageattr.c	2006-03-17 23:04:21.000000000 +0000
+diff -pruN ../pristine-linux-2.6.16/arch/i386/mm/pageattr.c ./arch/i386/mm/pageattr.c
+--- ../pristine-linux-2.6.16/arch/i386/mm/pageattr.c	2006-03-20 05:53:29.000000000 +0000
++++ ./arch/i386/mm/pageattr.c	2006-03-20 19:38:23.000000000 +0000
 @@ -78,7 +78,7 @@ static void set_pmd_pte(pte_t *kpte, uns
  	unsigned long flags;
  
@@ -10,9 +10,9 @@ diff -pruN ../pristine-linux-2.6.16-rc6/arch/i386/mm/pageattr.c ./arch/i386/mm/p
  		return;
  
  	spin_lock_irqsave(&pgd_lock, flags);
-diff -pruN ../pristine-linux-2.6.16-rc6/arch/i386/mm/pgtable.c ./arch/i386/mm/pgtable.c
---- ../pristine-linux-2.6.16-rc6/arch/i386/mm/pgtable.c	2006-01-03 03:21:10.000000000 +0000
-+++ ./arch/i386/mm/pgtable.c	2006-03-17 23:04:21.000000000 +0000
+diff -pruN ../pristine-linux-2.6.16/arch/i386/mm/pgtable.c ./arch/i386/mm/pgtable.c
+--- ../pristine-linux-2.6.16/arch/i386/mm/pgtable.c	2006-03-20 05:53:29.000000000 +0000
++++ ./arch/i386/mm/pgtable.c	2006-03-20 19:38:23.000000000 +0000
 @@ -215,9 +215,10 @@ void pgd_ctor(void *pgd, kmem_cache_t *c
  		spin_lock_irqsave(&pgd_lock, flags);
  	}
@@ -85,9 +85,9 @@ diff -pruN ../pristine-linux-2.6.16-rc6/arch/i386/mm/pgtable.c ./arch/i386/mm/pg
  	/* in the non-PAE case, free_pgtables() clears user pgd entries */
  	kmem_cache_free(pgd_cache, pgd);
  }
-diff -pruN ../pristine-linux-2.6.16-rc6/include/asm-i386/pgtable-2level-defs.h ./include/asm-i386/pgtable-2level-defs.h
---- ../pristine-linux-2.6.16-rc6/include/asm-i386/pgtable-2level-defs.h	2006-01-03 03:21:10.000000000 +0000
-+++ ./include/asm-i386/pgtable-2level-defs.h	2006-03-17 23:04:21.000000000 +0000
+diff -pruN ../pristine-linux-2.6.16/include/asm-i386/pgtable-2level-defs.h ./include/asm-i386/pgtable-2level-defs.h
+--- ../pristine-linux-2.6.16/include/asm-i386/pgtable-2level-defs.h	2006-03-20 05:53:29.000000000 +0000
++++ ./include/asm-i386/pgtable-2level-defs.h	2006-03-20 19:38:23.000000000 +0000
 @@ -1,6 +1,8 @@
  #ifndef _I386_PGTABLE_2LEVEL_DEFS_H
  #define _I386_PGTABLE_2LEVEL_DEFS_H
@@ -97,9 +97,9 @@ diff -pruN ../pristine-linux-2.6.16-rc6/include/asm-i386/pgtable-2level-defs.h .
  /*
   * traditional i386 two-level paging structure:
   */
-diff -pruN ../pristine-linux-2.6.16-rc6/include/asm-i386/pgtable-3level-defs.h ./include/asm-i386/pgtable-3level-defs.h
---- ../pristine-linux-2.6.16-rc6/include/asm-i386/pgtable-3level-defs.h	2006-01-03 03:21:10.000000000 +0000
-+++ ./include/asm-i386/pgtable-3level-defs.h	2006-03-17 23:04:21.000000000 +0000
+diff -pruN ../pristine-linux-2.6.16/include/asm-i386/pgtable-3level-defs.h ./include/asm-i386/pgtable-3level-defs.h
+--- ../pristine-linux-2.6.16/include/asm-i386/pgtable-3level-defs.h	2006-03-20 05:53:29.000000000 +0000
++++ ./include/asm-i386/pgtable-3level-defs.h	2006-03-20 19:38:23.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.16-rc6/smp-alts.patch b/patches/linux-2.6.16/smp-alts.patch
index 01261e6be0..86caa0e239 100644
--- a/patches/linux-2.6.16-rc6/smp-alts.patch
+++ b/patches/linux-2.6.16/smp-alts.patch
@@ -1,6 +1,6 @@
-diff -pruN ../pristine-linux-2.6.16-rc6/arch/i386/Kconfig ./arch/i386/Kconfig
---- ../pristine-linux-2.6.16-rc6/arch/i386/Kconfig	2006-03-17 22:59:01.000000000 +0000
-+++ ./arch/i386/Kconfig	2006-03-17 23:04:23.000000000 +0000
+diff -pruN ../pristine-linux-2.6.16/arch/i386/Kconfig ./arch/i386/Kconfig
+--- ../pristine-linux-2.6.16/arch/i386/Kconfig	2006-03-20 05:53:29.000000000 +0000
++++ ./arch/i386/Kconfig	2006-03-20 19:38:27.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.16-rc6/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.16-rc6/arch/i386/kernel/Makefile ./arch/i386/kernel/Makefile
---- ../pristine-linux-2.6.16-rc6/arch/i386/kernel/Makefile	2006-03-17 22:59:01.000000000 +0000
-+++ ./arch/i386/kernel/Makefile	2006-03-17 23:04:23.000000000 +0000
+diff -pruN ../pristine-linux-2.6.16/arch/i386/kernel/Makefile ./arch/i386/kernel/Makefile
+--- ../pristine-linux-2.6.16/arch/i386/kernel/Makefile	2006-03-20 05:53:29.000000000 +0000
++++ ./arch/i386/kernel/Makefile	2006-03-20 19:38:27.000000000 +0000
 @@ -37,6 +37,7 @@ obj-$(CONFIG_EFI) 		+= efi.o efi_stub.o
  obj-$(CONFIG_DOUBLEFAULT) 	+= doublefault.o
  obj-$(CONFIG_VM86)		+= vm86.o
@@ -32,9 +32,9 @@ diff -pruN ../pristine-linux-2.6.16-rc6/arch/i386/kernel/Makefile ./arch/i386/ke
  
  EXTRA_AFLAGS   := -traditional
  
-diff -pruN ../pristine-linux-2.6.16-rc6/arch/i386/kernel/smpalts.c ./arch/i386/kernel/smpalts.c
---- ../pristine-linux-2.6.16-rc6/arch/i386/kernel/smpalts.c	1970-01-01 01:00:00.000000000 +0100
-+++ ./arch/i386/kernel/smpalts.c	2006-03-17 23:04:23.000000000 +0000
+diff -pruN ../pristine-linux-2.6.16/arch/i386/kernel/smpalts.c ./arch/i386/kernel/smpalts.c
+--- ../pristine-linux-2.6.16/arch/i386/kernel/smpalts.c	1970-01-01 01:00:00.000000000 +0100
++++ ./arch/i386/kernel/smpalts.c	2006-03-20 19:38:27.000000000 +0000
 @@ -0,0 +1,85 @@
 +#include <linux/kernel.h>
 +#include <asm/system.h>
@@ -121,10 +121,10 @@ diff -pruN ../pristine-linux-2.6.16-rc6/arch/i386/kernel/smpalts.c ./arch/i386/k
 +	asm volatile ("jmp 1f\n1:");
 +	mb();
 +}
-diff -pruN ../pristine-linux-2.6.16-rc6/arch/i386/kernel/smpboot.c ./arch/i386/kernel/smpboot.c
---- ../pristine-linux-2.6.16-rc6/arch/i386/kernel/smpboot.c	2006-03-17 22:59:01.000000000 +0000
-+++ ./arch/i386/kernel/smpboot.c	2006-03-17 23:04:23.000000000 +0000
-@@ -1208,6 +1208,11 @@ static void __init smp_boot_cpus(unsigne
+diff -pruN ../pristine-linux-2.6.16/arch/i386/kernel/smpboot.c ./arch/i386/kernel/smpboot.c
+--- ../pristine-linux-2.6.16/arch/i386/kernel/smpboot.c	2006-03-20 05:53:29.000000000 +0000
++++ ./arch/i386/kernel/smpboot.c	2006-03-20 19:38:27.000000000 +0000
+@@ -1218,6 +1218,11 @@ static void __init smp_boot_cpus(unsigne
  		if (max_cpus <= cpucount+1)
  			continue;
  
@@ -136,7 +136,7 @@ diff -pruN ../pristine-linux-2.6.16-rc6/arch/i386/kernel/smpboot.c ./arch/i386/k
  		if (((cpu = alloc_cpu_id()) <= 0) || do_boot_cpu(apicid, cpu))
  			printk("CPU #%d not responding - cannot use it.\n",
  								apicid);
-@@ -1386,6 +1391,11 @@ int __devinit __cpu_up(unsigned int cpu)
+@@ -1396,6 +1401,11 @@ int __devinit __cpu_up(unsigned int cpu)
  		return -EIO;
  	}
  
@@ -148,9 +148,9 @@ diff -pruN ../pristine-linux-2.6.16-rc6/arch/i386/kernel/smpboot.c ./arch/i386/k
  	local_irq_enable();
  	per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
  	/* Unleash the CPU! */
-diff -pruN ../pristine-linux-2.6.16-rc6/arch/i386/kernel/vmlinux.lds.S ./arch/i386/kernel/vmlinux.lds.S
---- ../pristine-linux-2.6.16-rc6/arch/i386/kernel/vmlinux.lds.S	2006-01-03 03:21:10.000000000 +0000
-+++ ./arch/i386/kernel/vmlinux.lds.S	2006-03-17 23:04:23.000000000 +0000
+diff -pruN ../pristine-linux-2.6.16/arch/i386/kernel/vmlinux.lds.S ./arch/i386/kernel/vmlinux.lds.S
+--- ../pristine-linux-2.6.16/arch/i386/kernel/vmlinux.lds.S	2006-03-20 05:53:29.000000000 +0000
++++ ./arch/i386/kernel/vmlinux.lds.S	2006-03-20 19:38:27.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.16-rc6/arch/i386/kernel/vmlinux.lds.S ./arch/i3
    RODATA
  
    /* writeable */
-diff -pruN ../pristine-linux-2.6.16-rc6/include/asm-i386/atomic.h ./include/asm-i386/atomic.h
---- ../pristine-linux-2.6.16-rc6/include/asm-i386/atomic.h	2006-03-17 22:59:05.000000000 +0000
-+++ ./include/asm-i386/atomic.h	2006-03-17 23:04:23.000000000 +0000
+diff -pruN ../pristine-linux-2.6.16/include/asm-i386/atomic.h ./include/asm-i386/atomic.h
+--- ../pristine-linux-2.6.16/include/asm-i386/atomic.h	2006-03-20 05:53:29.000000000 +0000
++++ ./include/asm-i386/atomic.h	2006-03-20 19:38:27.000000000 +0000
 @@ -4,18 +4,13 @@
  #include <linux/config.h>
  #include <linux/compiler.h>
@@ -188,9 +188,9 @@ diff -pruN ../pristine-linux-2.6.16-rc6/include/asm-i386/atomic.h ./include/asm-
  /*
   * 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.16-rc6/include/asm-i386/bitops.h ./include/asm-i386/bitops.h
---- ../pristine-linux-2.6.16-rc6/include/asm-i386/bitops.h	2006-03-17 22:59:05.000000000 +0000
-+++ ./include/asm-i386/bitops.h	2006-03-17 23:04:23.000000000 +0000
+diff -pruN ../pristine-linux-2.6.16/include/asm-i386/bitops.h ./include/asm-i386/bitops.h
+--- ../pristine-linux-2.6.16/include/asm-i386/bitops.h	2006-03-20 05:53:29.000000000 +0000
++++ ./include/asm-i386/bitops.h	2006-03-20 19:38:27.000000000 +0000
 @@ -7,6 +7,7 @@
  
  #include <linux/config.h>
@@ -266,9 +266,9 @@ diff -pruN ../pristine-linux-2.6.16-rc6/include/asm-i386/bitops.h ./include/asm-
  		"btcl %2,%1\n\tsbbl %0,%0"
  		:"=r" (oldbit),"+m" (ADDR)
  		:"Ir" (nr) : "memory");
-diff -pruN ../pristine-linux-2.6.16-rc6/include/asm-i386/futex.h ./include/asm-i386/futex.h
---- ../pristine-linux-2.6.16-rc6/include/asm-i386/futex.h	2006-03-17 22:59:05.000000000 +0000
-+++ ./include/asm-i386/futex.h	2006-03-17 23:04:23.000000000 +0000
+diff -pruN ../pristine-linux-2.6.16/include/asm-i386/futex.h ./include/asm-i386/futex.h
+--- ../pristine-linux-2.6.16/include/asm-i386/futex.h	2006-03-20 05:53:29.000000000 +0000
++++ ./include/asm-i386/futex.h	2006-03-20 19:38:27.000000000 +0000
 @@ -28,7 +28,7 @@
  "1:	movl	%2, %0\n\
  	movl	%0, %3\n"					\
@@ -287,9 +287,9 @@ diff -pruN ../pristine-linux-2.6.16-rc6/include/asm-i386/futex.h ./include/asm-i
  					   oldval, uaddr, oparg);
  			break;
  		case FUTEX_OP_OR:
-diff -pruN ../pristine-linux-2.6.16-rc6/include/asm-i386/rwsem.h ./include/asm-i386/rwsem.h
---- ../pristine-linux-2.6.16-rc6/include/asm-i386/rwsem.h	2006-01-03 03:21:10.000000000 +0000
-+++ ./include/asm-i386/rwsem.h	2006-03-17 23:04:23.000000000 +0000
+diff -pruN ../pristine-linux-2.6.16/include/asm-i386/rwsem.h ./include/asm-i386/rwsem.h
+--- ../pristine-linux-2.6.16/include/asm-i386/rwsem.h	2006-03-20 05:53:29.000000000 +0000
++++ ./include/asm-i386/rwsem.h	2006-03-20 19:38:27.000000000 +0000
 @@ -40,6 +40,7 @@
  
  #include <linux/list.h>
@@ -370,9 +370,9 @@ diff -pruN ../pristine-linux-2.6.16-rc6/include/asm-i386/rwsem.h ./include/asm-i
  		: "+r"(tmp), "=m"(sem->count)
  		: "r"(sem), "m"(sem->count)
  		: "memory");
-diff -pruN ../pristine-linux-2.6.16-rc6/include/asm-i386/smp_alt.h ./include/asm-i386/smp_alt.h
---- ../pristine-linux-2.6.16-rc6/include/asm-i386/smp_alt.h	1970-01-01 01:00:00.000000000 +0100
-+++ ./include/asm-i386/smp_alt.h	2006-03-17 23:04:23.000000000 +0000
+diff -pruN ../pristine-linux-2.6.16/include/asm-i386/smp_alt.h ./include/asm-i386/smp_alt.h
+--- ../pristine-linux-2.6.16/include/asm-i386/smp_alt.h	1970-01-01 01:00:00.000000000 +0100
++++ ./include/asm-i386/smp_alt.h	2006-03-20 19:38:27.000000000 +0000
 @@ -0,0 +1,32 @@
 +#ifndef __ASM_SMP_ALT_H__
 +#define __ASM_SMP_ALT_H__
@@ -406,9 +406,9 @@ diff -pruN ../pristine-linux-2.6.16-rc6/include/asm-i386/smp_alt.h ./include/asm
 +#endif
 +
 +#endif /* __ASM_SMP_ALT_H__ */
-diff -pruN ../pristine-linux-2.6.16-rc6/include/asm-i386/spinlock.h ./include/asm-i386/spinlock.h
---- ../pristine-linux-2.6.16-rc6/include/asm-i386/spinlock.h	2006-01-03 03:21:10.000000000 +0000
-+++ ./include/asm-i386/spinlock.h	2006-03-17 23:04:23.000000000 +0000
+diff -pruN ../pristine-linux-2.6.16/include/asm-i386/spinlock.h ./include/asm-i386/spinlock.h
+--- ../pristine-linux-2.6.16/include/asm-i386/spinlock.h	2006-03-20 05:53:29.000000000 +0000
++++ ./include/asm-i386/spinlock.h	2006-03-20 19:38:27.000000000 +0000
 @@ -6,6 +6,7 @@
  #include <asm/page.h>
  #include <linux/config.h>
@@ -488,9 +488,9 @@ diff -pruN ../pristine-linux-2.6.16-rc6/include/asm-i386/spinlock.h ./include/as
  				 : "=m" (rw->lock) : : "memory");
  }
  
-diff -pruN ../pristine-linux-2.6.16-rc6/include/asm-i386/system.h ./include/asm-i386/system.h
---- ../pristine-linux-2.6.16-rc6/include/asm-i386/system.h	2006-03-17 22:59:05.000000000 +0000
-+++ ./include/asm-i386/system.h	2006-03-17 23:04:23.000000000 +0000
+diff -pruN ../pristine-linux-2.6.16/include/asm-i386/system.h ./include/asm-i386/system.h
+--- ../pristine-linux-2.6.16/include/asm-i386/system.h	2006-03-20 05:53:29.000000000 +0000
++++ ./include/asm-i386/system.h	2006-03-20 19:38:27.000000000 +0000
 @@ -5,7 +5,7 @@
  #include <linux/kernel.h>
  #include <asm/segment.h>