Update of /cvsroot/linux-vax/kernel-2.4/arch/alpha/kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv7538/arch/alpha/kernel
Modified Files:
alpha_ksyms.c irq_i8259.c smp.c
Log Message:
DA: sync with Marcelo 2.4.17
Index: alpha_ksyms.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/alpha/kernel/alpha_ksyms.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alpha_ksyms.c 10 Apr 2002 13:07:22 -0000 1.2
+++ alpha_ksyms.c 10 Jun 2003 01:13:13 -0000 1.3
@@ -258,3 +258,8 @@
EXPORT_SYMBOL_NOVERS(memchr);
EXPORT_SYMBOL(get_wchan);
+
+#ifdef CONFIG_ALPHA_IRONGATE
+EXPORT_SYMBOL(irongate_ioremap);
+EXPORT_SYMBOL(irongate_iounmap);
+#endif
Index: irq_i8259.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/alpha/kernel/irq_i8259.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- irq_i8259.c 14 Jan 2001 19:24:23 -0000 1.1.1.1
+++ irq_i8259.c 10 Jun 2003 01:13:13 -0000 1.2
@@ -22,7 +22,7 @@
/* Note mask bit is true for DISABLED irqs. */
static unsigned int cached_irq_mask = 0xffff;
-spinlock_t i8259_irq_lock = SPIN_LOCK_UNLOCKED;
+static spinlock_t i8259_irq_lock = SPIN_LOCK_UNLOCKED;
static inline void
i8259_update_irq_hw(unsigned int irq, unsigned long mask)
Index: smp.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/alpha/kernel/smp.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- smp.c 10 Apr 2002 13:07:22 -0000 1.2
+++ smp.c 10 Jun 2003 01:13:13 -0000 1.3
@@ -23,6 +23,7 @@
#include <linux/delay.h>
#include <linux/spinlock.h>
#include <linux/irq.h>
+#include <linux/cache.h>
#include <asm/hwrpb.h>
#include <asm/ptrace.h>
@@ -65,7 +66,7 @@
IPI_CPU_STOP,
};
-spinlock_t kernel_flag = SPIN_LOCK_UNLOCKED;
+spinlock_t kernel_flag __cacheline_aligned_in_smp = SPIN_LOCK_UNLOCKED;
/* Set to a secondary's cpuid when it comes online. */
static unsigned long smp_secondary_alive;
|
