[LV-kern-commit] CVS: kernel-2.4/arch/ppc/kernel i8259.c,1.2,1.3 pmac_pic.c,1.2,1.3 prom.c,1.2,1.3 smp.c,1.3,1.4

[Dave A. <ai...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/arch/ppc/kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv7538/arch/ppc/kernel

Modified Files:
	i8259.c pmac_pic.c prom.c smp.c 
Log Message:
DA: sync with Marcelo 2.4.17


Index: i8259.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/ppc/kernel/i8259.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- i8259.c	10 Apr 2002 15:04:06 -0000	1.2
+++ i8259.c	10 Jun 2003 01:13:15 -0000	1.3
@@ -13,7 +13,7 @@
 #define cached_A1 (cached_8259[0])
 #define cached_21 (cached_8259[1])
 
-spinlock_t i8259_lock = SPIN_LOCK_UNLOCKED;
+static spinlock_t i8259_lock = SPIN_LOCK_UNLOCKED;
 
 int i8259_pic_irq_offset;
 

Index: pmac_pic.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/ppc/kernel/pmac_pic.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pmac_pic.c	10 Apr 2002 15:04:09 -0000	1.2
+++ pmac_pic.c	10 Jun 2003 01:13:15 -0000	1.3
@@ -36,7 +36,7 @@
 static int max_irqs;
 static int max_real_irqs;
 
-spinlock_t pmac_pic_lock = SPIN_LOCK_UNLOCKED;
+static spinlock_t pmac_pic_lock = SPIN_LOCK_UNLOCKED;
 
 
 #define GATWICK_IRQ_POOL_SIZE        10

Index: prom.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/ppc/kernel/prom.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- prom.c	10 Apr 2002 15:04:10 -0000	1.2
+++ prom.c	10 Jun 2003 01:13:15 -0000	1.3
@@ -1928,7 +1928,7 @@
 }
 #endif
 
-spinlock_t rtas_lock = SPIN_LOCK_UNLOCKED;
+static spinlock_t rtas_lock = SPIN_LOCK_UNLOCKED;
 
 /* this can be called after setup -- Cort */
 int __openfirmware

Index: smp.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/ppc/kernel/smp.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- smp.c	13 Apr 2002 16:09:15 -0000	1.3
+++ smp.c	10 Jun 2003 01:13:15 -0000	1.4
@@ -23,6 +23,7 @@
 #include <linux/unistd.h>
 #include <linux/init.h>
 #include <linux/spinlock.h>
+#include <linux/cache.h>
 
 #include <asm/ptrace.h>
 #include <asm/atomic.h>
@@ -45,7 +46,7 @@
 struct klock_info_struct klock_info = { KLOCK_CLEAR, 0 };
 atomic_t ipi_recv;
 atomic_t ipi_sent;
-spinlock_t kernel_flag __cacheline_aligned = SPIN_LOCK_UNLOCKED;
+spinlock_t kernel_flag __cacheline_aligned_in_smp = SPIN_LOCK_UNLOCKED;
 unsigned int prof_multiplier[NR_CPUS];
 unsigned int prof_counter[NR_CPUS];
 cycles_t cacheflush_time;