ia64/xen-unstable

changeset 5843:a49bf96419a4

regenerate smp-alt.patch for 2.6.12

Signed-off-by: Vincent Hanquez <vincent@xensource.com>
author vh249@arcadians.cl.cam.ac.uk
date Mon Jul 25 09:56:50 2005 +0000 (2005-07-25)
parents dc7c14e533c2
children 7bc4ebdd5660
files patches/linux-2.6.12/smp-alts.patch
line diff
     1.1 --- a/patches/linux-2.6.12/smp-alts.patch	Fri Jul 22 17:58:52 2005 +0000
     1.2 +++ b/patches/linux-2.6.12/smp-alts.patch	Mon Jul 25 09:56:50 2005 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4 -diff -Naur linux-2.6.11/arch/i386/Kconfig linux-2.6.11.post/arch/i386/Kconfig
     1.5 ---- linux-2.6.11/arch/i386/Kconfig	2005-03-02 07:37:49.000000000 +0000
     1.6 -+++ linux-2.6.11.post/arch/i386/Kconfig	2005-06-10 13:42:35.000000000 +0100
     1.7 -@@ -481,6 +481,19 @@
     1.8 +diff -Naur linux-2.6.12/arch/i386/Kconfig linux-2.6.12.post/arch/i386/Kconfig
     1.9 +--- linux-2.6.12/arch/i386/Kconfig	2005-06-17 15:48:29.000000000 -0400
    1.10 ++++ linux-2.6.12.post/arch/i386/Kconfig	2005-07-25 05:51:21.000000000 -0400
    1.11 +@@ -487,6 +487,19 @@
    1.12   
    1.13   	  If you don't know what to do here, say N.
    1.14   
    1.15 @@ -21,10 +21,10 @@ diff -Naur linux-2.6.11/arch/i386/Kconfi
    1.16   config NR_CPUS
    1.17   	int "Maximum number of CPUs (2-255)"
    1.18   	range 2 255
    1.19 -diff -Naur linux-2.6.11/arch/i386/kernel/Makefile linux-2.6.11.post/arch/i386/kernel/Makefile
    1.20 ---- linux-2.6.11/arch/i386/kernel/Makefile	2005-03-02 07:37:49.000000000 +0000
    1.21 -+++ linux-2.6.11.post/arch/i386/kernel/Makefile	2005-06-16 11:16:18.555332435 +0100
    1.22 -@@ -32,6 +32,7 @@
    1.23 +diff -Naur linux-2.6.12/arch/i386/kernel/Makefile linux-2.6.12.post/arch/i386/kernel/Makefile
    1.24 +--- linux-2.6.12/arch/i386/kernel/Makefile	2005-06-17 15:48:29.000000000 -0400
    1.25 ++++ linux-2.6.12.post/arch/i386/kernel/Makefile	2005-07-25 05:51:21.000000000 -0400
    1.26 +@@ -33,6 +33,7 @@
    1.27   obj-$(CONFIG_HPET_TIMER) 	+= time_hpet.o
    1.28   obj-$(CONFIG_EFI) 		+= efi.o efi_stub.o
    1.29   obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
    1.30 @@ -32,9 +32,9 @@ diff -Naur linux-2.6.11/arch/i386/kernel
    1.31   
    1.32   EXTRA_AFLAGS   := -traditional
    1.33   
    1.34 -diff -Naur linux-2.6.11/arch/i386/kernel/smpalts.c linux-2.6.11.post/arch/i386/kernel/smpalts.c
    1.35 ---- linux-2.6.11/arch/i386/kernel/smpalts.c	1970-01-01 01:00:00.000000000 +0100
    1.36 -+++ linux-2.6.11.post/arch/i386/kernel/smpalts.c	2005-06-16 11:23:39.300902424 +0100
    1.37 +diff -Naur linux-2.6.12/arch/i386/kernel/smpalts.c linux-2.6.12.post/arch/i386/kernel/smpalts.c
    1.38 +--- linux-2.6.12/arch/i386/kernel/smpalts.c	1969-12-31 19:00:00.000000000 -0500
    1.39 ++++ linux-2.6.12.post/arch/i386/kernel/smpalts.c	2005-07-25 05:51:21.000000000 -0400
    1.40  @@ -0,0 +1,85 @@
    1.41  +#include <linux/kernel.h>
    1.42  +#include <asm/system.h>
    1.43 @@ -121,10 +121,10 @@ diff -Naur linux-2.6.11/arch/i386/kernel
    1.44  +	asm volatile ("jmp 1f\n1:");
    1.45  +	mb();
    1.46  +}
    1.47 -diff -Naur linux-2.6.11/arch/i386/kernel/smpboot.c linux-2.6.11.post/arch/i386/kernel/smpboot.c
    1.48 ---- linux-2.6.11/arch/i386/kernel/smpboot.c	2005-03-02 07:38:09.000000000 +0000
    1.49 -+++ linux-2.6.11.post/arch/i386/kernel/smpboot.c	2005-06-16 11:17:09.287064617 +0100
    1.50 -@@ -1003,6 +1003,11 @@
    1.51 +diff -Naur linux-2.6.12/arch/i386/kernel/smpboot.c linux-2.6.12.post/arch/i386/kernel/smpboot.c
    1.52 +--- linux-2.6.12/arch/i386/kernel/smpboot.c	2005-06-17 15:48:29.000000000 -0400
    1.53 ++++ linux-2.6.12.post/arch/i386/kernel/smpboot.c	2005-07-25 05:51:21.000000000 -0400
    1.54 +@@ -1001,6 +1001,11 @@
    1.55   		if (max_cpus <= cpucount+1)
    1.56   			continue;
    1.57   
    1.58 @@ -136,7 +136,7 @@ diff -Naur linux-2.6.11/arch/i386/kernel
    1.59   		if (do_boot_cpu(apicid))
    1.60   			printk("CPU #%d not responding - cannot use it.\n",
    1.61   								apicid);
    1.62 -@@ -1118,6 +1123,11 @@
    1.63 +@@ -1130,6 +1135,11 @@
    1.64   		return -EIO;
    1.65   	}
    1.66   
    1.67 @@ -148,9 +148,9 @@ diff -Naur linux-2.6.11/arch/i386/kernel
    1.68   	local_irq_enable();
    1.69   	/* Unleash the CPU! */
    1.70   	cpu_set(cpu, smp_commenced_mask);
    1.71 -diff -Naur linux-2.6.11/arch/i386/kernel/vmlinux.lds.S linux-2.6.11.post/arch/i386/kernel/vmlinux.lds.S
    1.72 ---- linux-2.6.11/arch/i386/kernel/vmlinux.lds.S	2005-03-02 07:38:37.000000000 +0000
    1.73 -+++ linux-2.6.11.post/arch/i386/kernel/vmlinux.lds.S	2005-06-10 11:14:14.000000000 +0100
    1.74 +diff -Naur linux-2.6.12/arch/i386/kernel/vmlinux.lds.S linux-2.6.12.post/arch/i386/kernel/vmlinux.lds.S
    1.75 +--- linux-2.6.12/arch/i386/kernel/vmlinux.lds.S	2005-06-17 15:48:29.000000000 -0400
    1.76 ++++ linux-2.6.12.post/arch/i386/kernel/vmlinux.lds.S	2005-07-25 05:51:21.000000000 -0400
    1.77  @@ -30,6 +30,13 @@
    1.78     __ex_table : { *(__ex_table) }
    1.79     __stop___ex_table = .;
    1.80 @@ -165,9 +165,9 @@ diff -Naur linux-2.6.11/arch/i386/kernel
    1.81     RODATA
    1.82   
    1.83     /* writeable */
    1.84 -diff -Naur linux-2.6.11/include/asm-i386/atomic.h linux-2.6.11.post/include/asm-i386/atomic.h
    1.85 ---- linux-2.6.11/include/asm-i386/atomic.h	2005-03-02 07:37:51.000000000 +0000
    1.86 -+++ linux-2.6.11.post/include/asm-i386/atomic.h	2005-06-13 10:10:39.000000000 +0100
    1.87 +diff -Naur linux-2.6.12/include/asm-i386/atomic.h linux-2.6.12.post/include/asm-i386/atomic.h
    1.88 +--- linux-2.6.12/include/asm-i386/atomic.h	2005-06-17 15:48:29.000000000 -0400
    1.89 ++++ linux-2.6.12.post/include/asm-i386/atomic.h	2005-07-25 05:51:21.000000000 -0400
    1.90  @@ -4,18 +4,13 @@
    1.91   #include <linux/config.h>
    1.92   #include <linux/compiler.h>
    1.93 @@ -188,9 +188,9 @@ diff -Naur linux-2.6.11/include/asm-i386
    1.94   /*
    1.95    * Make sure gcc doesn't try to be clever and move things around
    1.96    * on us. We need to use _exactly_ the address the user gave us,
    1.97 -diff -Naur linux-2.6.11/include/asm-i386/bitops.h linux-2.6.11.post/include/asm-i386/bitops.h
    1.98 ---- linux-2.6.11/include/asm-i386/bitops.h	2005-03-02 07:38:12.000000000 +0000
    1.99 -+++ linux-2.6.11.post/include/asm-i386/bitops.h	2005-06-13 10:11:54.000000000 +0100
   1.100 +diff -Naur linux-2.6.12/include/asm-i386/bitops.h linux-2.6.12.post/include/asm-i386/bitops.h
   1.101 +--- linux-2.6.12/include/asm-i386/bitops.h	2005-06-17 15:48:29.000000000 -0400
   1.102 ++++ linux-2.6.12.post/include/asm-i386/bitops.h	2005-07-25 05:51:21.000000000 -0400
   1.103  @@ -7,6 +7,7 @@
   1.104   
   1.105   #include <linux/config.h>
   1.106 @@ -266,9 +266,9 @@ diff -Naur linux-2.6.11/include/asm-i386
   1.107   		"btcl %2,%1\n\tsbbl %0,%0"
   1.108   		:"=r" (oldbit),"=m" (ADDR)
   1.109   		:"Ir" (nr) : "memory");
   1.110 -diff -Naur linux-2.6.11/include/asm-i386/rwsem.h linux-2.6.11.post/include/asm-i386/rwsem.h
   1.111 ---- linux-2.6.11/include/asm-i386/rwsem.h	2005-03-02 07:38:08.000000000 +0000
   1.112 -+++ linux-2.6.11.post/include/asm-i386/rwsem.h	2005-06-13 10:13:06.000000000 +0100
   1.113 +diff -Naur linux-2.6.12/include/asm-i386/rwsem.h linux-2.6.12.post/include/asm-i386/rwsem.h
   1.114 +--- linux-2.6.12/include/asm-i386/rwsem.h	2005-06-17 15:48:29.000000000 -0400
   1.115 ++++ linux-2.6.12.post/include/asm-i386/rwsem.h	2005-07-25 05:51:21.000000000 -0400
   1.116  @@ -40,6 +40,7 @@
   1.117   
   1.118   #include <linux/list.h>
   1.119 @@ -349,9 +349,9 @@ diff -Naur linux-2.6.11/include/asm-i386
   1.120   		: "+r"(tmp), "=m"(sem->count)
   1.121   		: "r"(sem), "m"(sem->count)
   1.122   		: "memory");
   1.123 -diff -Naur linux-2.6.11/include/asm-i386/smp_alt.h linux-2.6.11.post/include/asm-i386/smp_alt.h
   1.124 ---- linux-2.6.11/include/asm-i386/smp_alt.h	1970-01-01 01:00:00.000000000 +0100
   1.125 -+++ linux-2.6.11.post/include/asm-i386/smp_alt.h	2005-06-16 11:16:50.109433206 +0100
   1.126 +diff -Naur linux-2.6.12/include/asm-i386/smp_alt.h linux-2.6.12.post/include/asm-i386/smp_alt.h
   1.127 +--- linux-2.6.12/include/asm-i386/smp_alt.h	1969-12-31 19:00:00.000000000 -0500
   1.128 ++++ linux-2.6.12.post/include/asm-i386/smp_alt.h	2005-07-25 05:51:21.000000000 -0400
   1.129  @@ -0,0 +1,32 @@
   1.130  +#ifndef __ASM_SMP_ALT_H__
   1.131  +#define __ASM_SMP_ALT_H__
   1.132 @@ -385,9 +385,9 @@ diff -Naur linux-2.6.11/include/asm-i386
   1.133  +#endif
   1.134  +
   1.135  +#endif /* __ASM_SMP_ALT_H__ */
   1.136 -diff -Naur linux-2.6.11/include/asm-i386/spinlock.h linux-2.6.11.post/include/asm-i386/spinlock.h
   1.137 ---- linux-2.6.11/include/asm-i386/spinlock.h	2005-03-02 07:37:50.000000000 +0000
   1.138 -+++ linux-2.6.11.post/include/asm-i386/spinlock.h	2005-06-13 14:13:52.000000000 +0100
   1.139 +diff -Naur linux-2.6.12/include/asm-i386/spinlock.h linux-2.6.12.post/include/asm-i386/spinlock.h
   1.140 +--- linux-2.6.12/include/asm-i386/spinlock.h	2005-06-17 15:48:29.000000000 -0400
   1.141 ++++ linux-2.6.12.post/include/asm-i386/spinlock.h	2005-07-25 05:51:21.000000000 -0400
   1.142  @@ -6,6 +6,7 @@
   1.143   #include <asm/page.h>
   1.144   #include <linux/config.h>
   1.145 @@ -467,9 +467,9 @@ diff -Naur linux-2.6.11/include/asm-i386
   1.146   
   1.147   static inline int _raw_read_trylock(rwlock_t *lock)
   1.148   {
   1.149 -diff -Naur linux-2.6.11/include/asm-i386/system.h linux-2.6.11.post/include/asm-i386/system.h
   1.150 ---- linux-2.6.11/include/asm-i386/system.h	2005-03-02 07:37:30.000000000 +0000
   1.151 -+++ linux-2.6.11.post/include/asm-i386/system.h	2005-06-15 13:21:40.000000000 +0100
   1.152 +diff -Naur linux-2.6.12/include/asm-i386/system.h linux-2.6.12.post/include/asm-i386/system.h
   1.153 +--- linux-2.6.12/include/asm-i386/system.h	2005-06-17 15:48:29.000000000 -0400
   1.154 ++++ linux-2.6.12.post/include/asm-i386/system.h	2005-07-25 05:51:21.000000000 -0400
   1.155  @@ -5,7 +5,7 @@
   1.156   #include <linux/kernel.h>
   1.157   #include <asm/segment.h>