diff options
author | cl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk> | 2006-02-02 19:16:38 +0000 |
---|---|---|
committer | cl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk> | 2006-02-02 19:16:38 +0000 |
commit | a8f141f4650c46f2800f955da67e4299cb8c832d (patch) | |
tree | 1f88753734cd82d05918eea2b7af530b8f880029 /patches | |
parent | e1aded64c50200c03c296f65867aad6355ad62c3 (diff) | |
download | xen-a8f141f4650c46f2800f955da67e4299cb8c832d.tar.gz xen-a8f141f4650c46f2800f955da67e4299cb8c832d.tar.bz2 xen-a8f141f4650c46f2800f955da67e4299cb8c832d.zip |
Update to Linux 2.6.16-rc1-git4.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
--HG--
rename : patches/linux-2.6.15/i386-mach-io-check-nmi.patch => patches/linux-2.6.16-rc1-git4/i386-mach-io-check-nmi.patch
rename : patches/linux-2.6.15/net-csum.patch => patches/linux-2.6.16-rc1-git4/net-csum.patch
rename : patches/linux-2.6.15/pmd-shared.patch => patches/linux-2.6.16-rc1-git4/pmd-shared.patch
rename : patches/linux-2.6.15/smp-alts.patch => patches/linux-2.6.16-rc1-git4/smp-alts.patch
Diffstat (limited to 'patches')
-rw-r--r-- | patches/linux-2.6.16-rc1-git4/i386-mach-io-check-nmi.patch (renamed from patches/linux-2.6.15/i386-mach-io-check-nmi.patch) | 16 | ||||
-rw-r--r-- | patches/linux-2.6.16-rc1-git4/net-csum.patch (renamed from patches/linux-2.6.15/net-csum.patch) | 12 | ||||
-rw-r--r-- | patches/linux-2.6.16-rc1-git4/pmd-shared.patch (renamed from patches/linux-2.6.15/pmd-shared.patch) | 26 | ||||
-rw-r--r-- | patches/linux-2.6.16-rc1-git4/smp-alts.patch (renamed from patches/linux-2.6.15/smp-alts.patch) | 102 |
4 files changed, 78 insertions, 78 deletions
diff --git a/patches/linux-2.6.15/i386-mach-io-check-nmi.patch b/patches/linux-2.6.16-rc1-git4/i386-mach-io-check-nmi.patch index 990e358890..fddb891d6f 100644 --- a/patches/linux-2.6.15/i386-mach-io-check-nmi.patch +++ b/patches/linux-2.6.16-rc1-git4/i386-mach-io-check-nmi.patch @@ -1,13 +1,13 @@ -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 +diff -pruN ../pristine-linux-2.6.16-rc1-git4/arch/i386/kernel/traps.c ./arch/i386/kernel/traps.c +--- ../pristine-linux-2.6.16-rc1-git4/arch/i386/kernel/traps.c 2006-02-02 17:39:29.000000000 +0000 ++++ ./arch/i386/kernel/traps.c 2006-02-02 17:43:01.000000000 +0000 +@@ -564,18 +564,11 @@ static void mem_parity_error(unsigned ch static void io_check_error(unsigned char reason, struct pt_regs * regs) { - unsigned long i; - - printk("NMI: IOCK error (debug interrupt?)\n"); + printk(KERN_EMERG "NMI: IOCK error (debug interrupt?)\n"); show_registers(regs); /* Re-enable the IOCK line, wait for a few seconds */ @@ -21,9 +21,9 @@ diff -pruN ../pristine-linux-2.6.15/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.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 +diff -pruN ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/mach-default/mach_traps.h ./include/asm-i386/mach-default/mach_traps.h +--- ../pristine-linux-2.6.16-rc1-git4/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:41:55.000000000 +0000 @@ -15,6 +15,18 @@ static inline void clear_mem_error(unsig outb(reason, 0x61); } diff --git a/patches/linux-2.6.15/net-csum.patch b/patches/linux-2.6.16-rc1-git4/net-csum.patch index 9a5e62aeb3..a1b4a24c0c 100644 --- a/patches/linux-2.6.15/net-csum.patch +++ b/patches/linux-2.6.16-rc1-git4/net-csum.patch @@ -1,6 +1,6 @@ -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 +diff -pruN ../pristine-linux-2.6.16-rc1-git4/net/ipv4/netfilter/ip_nat_proto_tcp.c ./net/ipv4/netfilter/ip_nat_proto_tcp.c +--- ../pristine-linux-2.6.16-rc1-git4/net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-02-02 17:39:51.000000000 +0000 ++++ ./net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-02-02 17:44:18.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.15/net/ipv4/netfilter/ip_nat_proto_tcp.c ./net/ return 1; } -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 +diff -pruN ../pristine-linux-2.6.16-rc1-git4/net/ipv4/netfilter/ip_nat_proto_udp.c ./net/ipv4/netfilter/ip_nat_proto_udp.c +--- ../pristine-linux-2.6.16-rc1-git4/net/ipv4/netfilter/ip_nat_proto_udp.c 2006-02-02 17:39:51.000000000 +0000 ++++ ./net/ipv4/netfilter/ip_nat_proto_udp.c 2006-02-02 17:44:18.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.15/pmd-shared.patch b/patches/linux-2.6.16-rc1-git4/pmd-shared.patch index 053e987fdb..3764a3219e 100644 --- a/patches/linux-2.6.15/pmd-shared.patch +++ b/patches/linux-2.6.16-rc1-git4/pmd-shared.patch @@ -1,7 +1,7 @@ -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 +diff -pruN ../pristine-linux-2.6.16-rc1-git4/arch/i386/mm/pageattr.c ./arch/i386/mm/pageattr.c +--- ../pristine-linux-2.6.16-rc1-git4/arch/i386/mm/pageattr.c 2006-02-02 17:39:29.000000000 +0000 ++++ ./arch/i386/mm/pageattr.c 2006-02-02 17:45:14.000000000 +0000 +@@ -78,7 +78,7 @@ static void set_pmd_pte(pte_t *kpte, uns unsigned long flags; set_pte_atomic(kpte, pte); /* change init_mm */ @@ -10,9 +10,9 @@ diff -pruN ../pristine-linux-2.6.15/arch/i386/mm/pageattr.c ./arch/i386/mm/pagea return; spin_lock_irqsave(&pgd_lock, flags); -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 +diff -pruN ../pristine-linux-2.6.16-rc1-git4/arch/i386/mm/pgtable.c ./arch/i386/mm/pgtable.c +--- ../pristine-linux-2.6.16-rc1-git4/arch/i386/mm/pgtable.c 2006-01-03 03:21:10.000000000 +0000 ++++ ./arch/i386/mm/pgtable.c 2006-02-02 17:45:14.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.15/arch/i386/mm/pgtable.c ./arch/i386/mm/pgtabl /* in the non-PAE case, free_pgtables() clears user pgd entries */ kmem_cache_free(pgd_cache, pgd); } -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 +diff -pruN ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/pgtable-2level-defs.h ./include/asm-i386/pgtable-2level-defs.h +--- ../pristine-linux-2.6.16-rc1-git4/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:45:14.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.15/include/asm-i386/pgtable-2level-defs.h ./inc /* * traditional i386 two-level paging structure: */ -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 +diff -pruN ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/pgtable-3level-defs.h ./include/asm-i386/pgtable-3level-defs.h +--- ../pristine-linux-2.6.16-rc1-git4/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:45: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.15/smp-alts.patch b/patches/linux-2.6.16-rc1-git4/smp-alts.patch index 9389616848..87f563f540 100644 --- a/patches/linux-2.6.15/smp-alts.patch +++ b/patches/linux-2.6.16-rc1-git4/smp-alts.patch @@ -1,7 +1,7 @@ -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 +diff -pruN ../pristine-linux-2.6.16-rc1-git4/arch/i386/Kconfig ./arch/i386/Kconfig +--- ../pristine-linux-2.6.16-rc1-git4/arch/i386/Kconfig 2006-02-02 17:39:28.000000000 +0000 ++++ ./arch/i386/Kconfig 2006-02-02 17:45:59.000000000 +0000 +@@ -211,6 +211,19 @@ config SMP If you don't know what to do here, say N. @@ -21,20 +21,20 @@ diff -pruN ../pristine-linux-2.6.15/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.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 +diff -pruN ../pristine-linux-2.6.16-rc1-git4/arch/i386/kernel/Makefile ./arch/i386/kernel/Makefile +--- ../pristine-linux-2.6.16-rc1-git4/arch/i386/kernel/Makefile 2006-02-02 17:39:28.000000000 +0000 ++++ ./arch/i386/kernel/Makefile 2006-02-02 17:45:59.000000000 +0000 +@@ -37,6 +37,7 @@ obj-$(CONFIG_EFI) += efi.o efi_stub.o + obj-$(CONFIG_DOUBLEFAULT) += doublefault.o + obj-$(CONFIG_VM86) += vm86.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o +obj-$(CONFIG_SMP_ALTERNATIVES) += smpalts.o EXTRA_AFLAGS := -traditional -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 +diff -pruN ../pristine-linux-2.6.16-rc1-git4/arch/i386/kernel/smpalts.c ./arch/i386/kernel/smpalts.c +--- ../pristine-linux-2.6.16-rc1-git4/arch/i386/kernel/smpalts.c 1970-01-01 01:00:00.000000000 +0100 ++++ ./arch/i386/kernel/smpalts.c 2006-02-02 17:45:59.000000000 +0000 @@ -0,0 +1,85 @@ +#include <linux/kernel.h> +#include <asm/system.h> @@ -121,10 +121,10 @@ diff -pruN ../pristine-linux-2.6.15/arch/i386/kernel/smpalts.c ./arch/i386/kerne + asm volatile ("jmp 1f\n1:"); + mb(); +} -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 +diff -pruN ../pristine-linux-2.6.16-rc1-git4/arch/i386/kernel/smpboot.c ./arch/i386/kernel/smpboot.c +--- ../pristine-linux-2.6.16-rc1-git4/arch/i386/kernel/smpboot.c 2006-02-02 17:39:29.000000000 +0000 ++++ ./arch/i386/kernel/smpboot.c 2006-02-02 17:45:59.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.15/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); -@@ -1390,6 +1395,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.15/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.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 +diff -pruN ../pristine-linux-2.6.16-rc1-git4/arch/i386/kernel/vmlinux.lds.S ./arch/i386/kernel/vmlinux.lds.S +--- ../pristine-linux-2.6.16-rc1-git4/arch/i386/kernel/vmlinux.lds.S 2006-01-03 03:21:10.000000000 +0000 ++++ ./arch/i386/kernel/vmlinux.lds.S 2006-02-02 17:45:59.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.15/arch/i386/kernel/vmlinux.lds.S ./arch/i386/k RODATA /* writeable */ -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 +diff -pruN ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/atomic.h ./include/asm-i386/atomic.h +--- ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/atomic.h 2006-02-02 17:39:31.000000000 +0000 ++++ ./include/asm-i386/atomic.h 2006-02-02 17:45:59.000000000 +0000 @@ -4,18 +4,13 @@ #include <linux/config.h> #include <linux/compiler.h> @@ -188,9 +188,9 @@ diff -pruN ../pristine-linux-2.6.15/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.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 +diff -pruN ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/bitops.h ./include/asm-i386/bitops.h +--- ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/bitops.h 2006-02-02 17:39:31.000000000 +0000 ++++ ./include/asm-i386/bitops.h 2006-02-02 17:45:59.000000000 +0000 @@ -7,6 +7,7 @@ #include <linux/config.h> @@ -219,7 +219,7 @@ diff -pruN ../pristine-linux-2.6.15/include/asm-i386/bitops.h ./include/asm-i386 - __asm__ __volatile__( LOCK_PREFIX + __asm__ __volatile__( LOCK "btsl %1,%0" - :"=m" (ADDR) + :"+m" (ADDR) :"Ir" (nr)); @@ -76,7 +71,7 @@ static inline void __set_bit(int nr, vol */ @@ -228,7 +228,7 @@ diff -pruN ../pristine-linux-2.6.15/include/asm-i386/bitops.h ./include/asm-i386 - __asm__ __volatile__( LOCK_PREFIX + __asm__ __volatile__( LOCK "btrl %1,%0" - :"=m" (ADDR) + :"+m" (ADDR) :"Ir" (nr)); @@ -121,7 +116,7 @@ static inline void __change_bit(int nr, */ @@ -237,7 +237,7 @@ diff -pruN ../pristine-linux-2.6.15/include/asm-i386/bitops.h ./include/asm-i386 - __asm__ __volatile__( LOCK_PREFIX + __asm__ __volatile__( LOCK "btcl %1,%0" - :"=m" (ADDR) + :"+m" (ADDR) :"Ir" (nr)); @@ -140,7 +135,7 @@ static inline int test_and_set_bit(int n { @@ -246,7 +246,7 @@ diff -pruN ../pristine-linux-2.6.15/include/asm-i386/bitops.h ./include/asm-i386 - __asm__ __volatile__( LOCK_PREFIX + __asm__ __volatile__( LOCK "btsl %2,%1\n\tsbbl %0,%0" - :"=r" (oldbit),"=m" (ADDR) + :"=r" (oldbit),"+m" (ADDR) :"Ir" (nr) : "memory"); @@ -180,7 +175,7 @@ static inline int test_and_clear_bit(int { @@ -255,7 +255,7 @@ diff -pruN ../pristine-linux-2.6.15/include/asm-i386/bitops.h ./include/asm-i386 - __asm__ __volatile__( LOCK_PREFIX + __asm__ __volatile__( LOCK "btrl %2,%1\n\tsbbl %0,%0" - :"=r" (oldbit),"=m" (ADDR) + :"=r" (oldbit),"+m" (ADDR) :"Ir" (nr) : "memory"); @@ -231,7 +226,7 @@ static inline int test_and_change_bit(in { @@ -264,11 +264,11 @@ diff -pruN ../pristine-linux-2.6.15/include/asm-i386/bitops.h ./include/asm-i386 - __asm__ __volatile__( LOCK_PREFIX + __asm__ __volatile__( LOCK "btcl %2,%1\n\tsbbl %0,%0" - :"=r" (oldbit),"=m" (ADDR) + :"=r" (oldbit),"+m" (ADDR) :"Ir" (nr) : "memory"); -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 +diff -pruN ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/futex.h ./include/asm-i386/futex.h +--- ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/futex.h 2006-02-02 17:40:00.000000000 +0000 ++++ ./include/asm-i386/futex.h 2006-02-02 17:45:59.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.15/include/asm-i386/futex.h ./include/asm-i386/ 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 +diff -pruN ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/rwsem.h ./include/asm-i386/rwsem.h +--- ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/rwsem.h 2006-01-03 03:21:10.000000000 +0000 ++++ ./include/asm-i386/rwsem.h 2006-02-02 17:45:59.000000000 +0000 @@ -40,6 +40,7 @@ #include <linux/list.h> @@ -370,9 +370,9 @@ diff -pruN ../pristine-linux-2.6.15/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.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 +diff -pruN ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/smp_alt.h ./include/asm-i386/smp_alt.h +--- ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/smp_alt.h 1970-01-01 01:00:00.000000000 +0100 ++++ ./include/asm-i386/smp_alt.h 2006-02-02 17:45:59.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.15/include/asm-i386/smp_alt.h ./include/asm-i38 +#endif + +#endif /* __ASM_SMP_ALT_H__ */ -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 +diff -pruN ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/spinlock.h ./include/asm-i386/spinlock.h +--- ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/spinlock.h 2006-01-03 03:21:10.000000000 +0000 ++++ ./include/asm-i386/spinlock.h 2006-02-02 17:45:59.000000000 +0000 @@ -6,6 +6,7 @@ #include <asm/page.h> #include <linux/config.h> @@ -488,9 +488,9 @@ diff -pruN ../pristine-linux-2.6.15/include/asm-i386/spinlock.h ./include/asm-i3 : "=m" (rw->lock) : : "memory"); } -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 +diff -pruN ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/system.h ./include/asm-i386/system.h +--- ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/system.h 2006-02-02 17:39:31.000000000 +0000 ++++ ./include/asm-i386/system.h 2006-02-02 17:45:59.000000000 +0000 @@ -5,7 +5,7 @@ #include <linux/kernel.h> #include <asm/segment.h> @@ -500,7 +500,7 @@ diff -pruN ../pristine-linux-2.6.15/include/asm-i386/system.h ./include/asm-i386 #ifdef __KERNEL__ -@@ -274,19 +274,19 @@ static inline unsigned long __cmpxchg(vo +@@ -271,19 +271,19 @@ static inline unsigned long __cmpxchg(vo unsigned long prev; switch (size) { case 1: @@ -523,7 +523,7 @@ diff -pruN ../pristine-linux-2.6.15/include/asm-i386/system.h ./include/asm-i386 : "=a"(prev) : "r"(new), "m"(*__xg(ptr)), "0"(old) : "memory"); -@@ -339,7 +339,7 @@ static inline unsigned long long __cmpxc +@@ -336,7 +336,7 @@ static inline unsigned long long __cmpxc unsigned long long new) { unsigned long long prev; @@ -532,7 +532,7 @@ diff -pruN ../pristine-linux-2.6.15/include/asm-i386/system.h ./include/asm-i386 : "=A"(prev) : "b"((unsigned long)new), "c"((unsigned long)(new >> 32)), -@@ -506,11 +506,55 @@ struct alt_instr { +@@ -503,11 +503,55 @@ struct alt_instr { #endif #ifdef CONFIG_SMP |