From: roel <12o3l@tiscali.nl> Replace some SPIN_LOCK_UNLOCKED with DEFINE_SPINLOCK Signed-off-by: Roel Kluin <12o3l@tiscali.nl> Acked-by: Thomas Gleixner Signed-off-by: Andrew Morton --- diff -puN arch/mips/pci/ops-pmcmsp.c~spin_lock_unlocked-cleanups arch/mips/pci/ops-pmcmsp.c --- a/arch/mips/pci/ops-pmcmsp.c~spin_lock_unlocked-cleanups +++ a/arch/mips/pci/ops-pmcmsp.c @@ -206,7 +206,7 @@ static void pci_proc_init(void) } #endif /* CONFIG_PROC_FS && PCI_COUNTERS */ -spinlock_t bpci_lock = SPIN_LOCK_UNLOCKED; +DEFINE_SPINLOCK(bpci_lock); /***************************************************************************** * diff -puN arch/powerpc/mm/slice.c~spin_lock_unlocked-cleanups arch/powerpc/mm/slice.c --- a/arch/powerpc/mm/slice.c~spin_lock_unlocked-cleanups +++ a/arch/powerpc/mm/slice.c @@ -34,7 +34,7 @@ #include #include -static spinlock_t slice_convert_lock = SPIN_LOCK_UNLOCKED; +static DEFINE_SPINLOCK(slice_convert_lock); #ifdef DEBUG diff -puN drivers/ieee1394/ieee1394_core.c~spin_lock_unlocked-cleanups drivers/ieee1394/ieee1394_core.c --- a/drivers/ieee1394/ieee1394_core.c~spin_lock_unlocked-cleanups +++ a/drivers/ieee1394/ieee1394_core.c @@ -488,7 +488,7 @@ void hpsb_selfid_complete(struct hpsb_ho highlevel_host_reset(host); } -static spinlock_t pending_packets_lock = SPIN_LOCK_UNLOCKED; +static DEFINE_SPINLOCK(pending_packets_lock); /** * hpsb_packet_sent - notify core of sending a packet diff -puN fs/sysfs/dir.c~spin_lock_unlocked-cleanups fs/sysfs/dir.c --- a/fs/sysfs/dir.c~spin_lock_unlocked-cleanups +++ a/fs/sysfs/dir.c @@ -16,9 +16,9 @@ DEFINE_MUTEX(sysfs_mutex); DEFINE_MUTEX(sysfs_rename_mutex); -spinlock_t sysfs_assoc_lock = SPIN_LOCK_UNLOCKED; +DEFINE_SPINLOCK(sysfs_assoc_lock); -static spinlock_t sysfs_ino_lock = SPIN_LOCK_UNLOCKED; +static DEFINE_SPINLOCK(sysfs_ino_lock); static DEFINE_IDA(sysfs_ino_ida); /** _