Update of /cvsroot/linux-vax/kernel-2.4/arch/ia64/kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv7538/arch/ia64/kernel
Modified Files:
efivars.c pci.c smp.c
Log Message:
DA: sync with Marcelo 2.4.17
Index: efivars.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/ia64/kernel/efivars.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- efivars.c 10 Apr 2002 14:27:20 -0000 1.1
+++ efivars.c 10 Jun 2003 01:13:14 -0000 1.2
@@ -100,7 +100,7 @@
struct list_head list;
} efivar_entry_t;
-spinlock_t efivars_lock = SPIN_LOCK_UNLOCKED;
+static spinlock_t efivars_lock = SPIN_LOCK_UNLOCKED;
static LIST_HEAD(efivar_list);
static struct proc_dir_entry *efi_vars_dir = NULL;
Index: pci.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/ia64/kernel/pci.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pci.c 10 Apr 2002 14:27:20 -0000 1.2
+++ pci.c 10 Jun 2003 01:13:14 -0000 1.3
@@ -46,7 +46,7 @@
* This interrupt-safe spinlock protects all accesses to PCI
* configuration space.
*/
-spinlock_t pci_lock = SPIN_LOCK_UNLOCKED;
+static spinlock_t pci_lock = SPIN_LOCK_UNLOCKED;
struct pci_fixup pcibios_fixups[] = {
{ 0 }
Index: smp.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/ia64/kernel/smp.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- smp.c 10 Apr 2002 14:27:21 -0000 1.2
+++ smp.c 10 Jun 2003 01:13:14 -0000 1.3
@@ -30,6 +30,7 @@
#include <linux/kernel_stat.h>
#include <linux/mm.h>
#include <linux/delay.h>
+#include <linux/cache.h>
#include <asm/atomic.h>
#include <asm/bitops.h>
@@ -51,7 +52,7 @@
#include <asm/mca.h>
/* The 'big kernel lock' */
-spinlock_t kernel_flag = SPIN_LOCK_UNLOCKED;
+spinlock_t kernel_flag __cacheline_aligned_in_smp = SPIN_LOCK_UNLOCKED;
/*
* Structure and data for smp_call_function(). This is designed to minimise static memory
|
