Skip to contentSkip to conversation

more SPIN_LOCK_UNLOCKED -> DEFINE_SPINLOCK conversions

PATCH New Ingo Molnar 1 participant 1 message Jun 20, 2005

Subsystems (12)
Networking Network drivers Arm (32-bit) SCSI +8 more subsystems
lore
Share & tools
lore

Ingo Molnar

author
#0 lore raw

PATCH 1/1 more SPIN_LOCK_UNLOCKED -> DEFINE_SPINLOCK conversions

this converts the final 20 DEFINE_SPINLOCK holdouts. (another 580 places are already using DEFINE_SPINLOCK). Build tested on x86.

Signed-off-by Ingo Molnar <[email protected]>
 20 files changed, 20 insertions(+), 20 deletions(-)
net/core/pktgen.c renamed from net/core/pktgen.c.orig +1 -1
@@ -503,7 +503,7 @@ static int pg_delay_d = 0;
 static int pg_clone_skb_d = 0;
 static int debug = 0;
 
-static spinlock_t _thread_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(_thread_lock);
 static struct pktgen_thread *pktgen_threads = NULL;
 
 static char module_fname[128];
net/core/netpoll.c renamed from net/core/netpoll.c.orig +1 -1
@@ -612,7 +612,7 @@ int netpoll_setup(struct netpoll *np)
 	struct net_device *ndev = NULL;
 	struct in_device *in_dev;
 
-	np->poll_lock = SPIN_LOCK_UNLOCKED;
+	spin_lock_init(&np->poll_lock);
 	np->poll_owner = -1;
 
 	if (np->dev_name)
fs/xfs/support/ktrace.c renamed from fs/xfs/support/ktrace.c.orig +1 -1
@@ -170,7 +170,7 @@ ktrace_enter(
 	void            *val14,
 	void            *val15)
 {
-	static lock_t   wrap_lock = SPIN_LOCK_UNLOCKED;
+	static DEFINE_SPINLOCK(wrap_lock);
 	unsigned long	flags;
 	int             index;
 	ktrace_entry_t  *ktep;
arch/ppc/syslib/qspan_pci.c renamed from arch/ppc/syslib/qspan_pci.c.orig +1 -1
@@ -94,7 +94,7 @@
 #define mk_config_type1(bus, dev, offset) \
 	mk_config_addr(bus, dev, offset) | 1;
 
-static spinlock_t pcibios_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(pcibios_lock);
 
 int qspan_pcibios_read_config_byte(unsigned char bus, unsigned char dev_fn,
 				  unsigned char offset, unsigned char *val)
arch/ppc/syslib/mv64x60.c renamed from arch/ppc/syslib/mv64x60.c.orig +1 -1
@@ -32,7 +32,7 @@
 
 
 u8		mv64x60_pci_exclude_bridge = 1;
-spinlock_t	mv64x60_lock = SPIN_LOCK_UNLOCKED;
+DEFINE_SPINLOCK(mv64x60_lock);
 
 static phys_addr_t 	mv64x60_bridge_pbase = 0;
 static void 		*mv64x60_bridge_vbase = 0;
arch/ppc/platforms/hdpu.c renamed from arch/ppc/platforms/hdpu.c.orig +1 -1
@@ -58,7 +58,7 @@ static void parse_bootinfo(unsigned long
 static void hdpu_set_l1pe(void);
 static void hdpu_cpustate_set(unsigned char new_state);
 #ifdef CONFIG_SMP
-static spinlock_t timebase_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(timebase_lock);
 static unsigned int timebase_upper = 0, timebase_lower = 0;
 extern int smp_tb_synchronized;
arch/sparc/lib/atomic32.c renamed from arch/sparc/lib/atomic32.c.orig +1 -1
@@ -20,7 +20,7 @@ spinlock_t __atomic_hash[ATOMIC_HASH_SIZ
 
 #else /* SMP */
 
-static spinlock_t dummy = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(dummy);
 #define ATOMIC_HASH_SIZE	1
 #define ATOMIC_HASH(a)		(&dummy)
arch/arm/mach-pxa/corgi_ssp.c renamed from arch/arm/mach-pxa/corgi_ssp.c.orig +1 -1
@@ -22,7 +22,7 @@
 #include <asm/arch/corgi.h>
 #include <asm/arch/pxa-regs.h>
 
-static spinlock_t corgi_ssp_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(corgi_ssp_lock);
 static struct ssp_dev corgi_ssp_dev;
 static struct ssp_state corgi_ssp_state;
arch/ppc64/kernel/pmc.c renamed from arch/ppc64/kernel/pmc.c.orig +1 -1
@@ -26,7 +26,7 @@ static void dummy_perf(struct pt_regs *r
 	mtspr(SPRN_MMCR0, mmcr0);
 }
 
-static spinlock_t pmc_owner_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(pmc_owner_lock);
 static void *pmc_owner_caller; /* mostly for debugging */
 perf_irq_t perf_irq = dummy_perf;
arch/mips/kernel/i8259.c renamed from arch/mips/kernel/i8259.c.orig +1 -1
@@ -31,7 +31,7 @@ void disable_8259A_irq(unsigned int irq)
  * moves to arch independent land
  */
 
-spinlock_t i8259A_lock = SPIN_LOCK_UNLOCKED;
+spinlock_t DEFINE_SPINLOCK(i8259A_lock);
 
 static void end_8259A_irq (unsigned int irq)
 {
arch/mips/kernel/gdb-stub.c renamed from arch/mips/kernel/gdb-stub.c.orig +1 -1
@@ -176,7 +176,7 @@ int kgdb_enabled;
 /*
  * spin locks for smp case
  */
-static spinlock_t kgdb_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(kgdb_lock);
 static spinlock_t kgdb_cpulock[NR_CPUS] = { [0 ... NR_CPUS-1] = SPIN_LOCK_UNLOCKED};
 
 /*
arch/mips/kernel/genrtc.c renamed from arch/mips/kernel/genrtc.c.orig +1 -1
@@ -14,7 +14,7 @@
 #include <asm/rtc.h>
 #include <asm/time.h>
 
-static spinlock_t mips_rtc_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(mips_rtc_lock);
 
 unsigned int get_rtc_time(struct rtc_time *time)
 {
arch/ia64/kernel/perfmon.c renamed from arch/ia64/kernel/perfmon.c.orig +1 -1
@@ -497,7 +497,7 @@ typedef struct {
 static pfm_stats_t		pfm_stats[NR_CPUS];
 static pfm_session_t		pfm_sessions;	/* global sessions information */
 
-static spinlock_t pfm_alt_install_check = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(pfm_alt_install_check);
 static pfm_intr_handler_desc_t  *pfm_alt_intr_handler;
 
 static struct proc_dir_entry 	*perfmon_dir;
arch/ia64/sn/kernel/xpnet.c renamed from arch/ia64/sn/kernel/xpnet.c.orig +1 -1
@@ -130,7 +130,7 @@ struct net_device *xpnet_device;
  */
 static u64 xpnet_broadcast_partitions;
 /* protect above */
-static spinlock_t xpnet_broadcast_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(xpnet_broadcast_lock);
 
 /*
  * Since the Block Transfer Engine (BTE) is being used for the transfer
drivers/net/mv643xx_eth.c renamed from drivers/net/mv643xx_eth.c.orig +1 -1
@@ -95,7 +95,7 @@ static char mv643xx_driver_version[] = "
 static void __iomem *mv643xx_eth_shared_base;
 
 /* used to protect MV643XX_ETH_SMI_REG, which is shared across ports */
-static spinlock_t mv643xx_eth_phy_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(mv643xx_eth_phy_lock);
 
 static inline u32 mv_read(int offset)
 {
drivers/parisc/iosapic.c renamed from drivers/parisc/iosapic.c.orig +1 -1
@@ -215,7 +215,7 @@ static inline void iosapic_write(void __
 #define IOSAPIC_IRDT_ID_EID_SHIFT              0x10
 
 
-static spinlock_t iosapic_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(iosapic_lock);
 
 static inline void iosapic_eoi(void __iomem *addr, unsigned int data)
 {
drivers/scsi/ch.c renamed from drivers/scsi/ch.c.orig +1 -1
@@ -117,7 +117,7 @@ typedef struct {
 } scsi_changer;
 
 static LIST_HEAD(ch_devlist);
-static spinlock_t ch_devlist_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(ch_devlist_lock);
 static int ch_devcount;
 
 static struct scsi_driver ch_template =
drivers/video/backlight/corgi_bl.c renamed from drivers/video/backlight/corgi_bl.c.orig +1 -1
@@ -29,7 +29,7 @@
 static int corgibl_powermode = FB_BLANK_UNBLANK;
 static int current_intensity = 0;
 static int corgibl_limit = 0;
-static spinlock_t bl_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(bl_lock);
 
 static void corgibl_send_intensity(int intensity)
 {
drivers/video/geode/display_gx1.c renamed from drivers/video/geode/display_gx1.c.orig +1 -1
@@ -22,7 +22,7 @@
 #include "geodefb.h"
 #include "display_gx1.h"
 
-static spinlock_t gx1_conf_reg_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(gx1_conf_reg_lock);
 
 static u8 gx1_read_conf_reg(u8 reg)
 {
include/linux/netfilter_ipv4/lockhelp.h renamed from include/linux/netfilter_ipv4/lockhelp.h.orig +1 -1
@@ -106,7 +106,7 @@ do {								\
 } while(0)
 
 #else
-#define DECLARE_LOCK(l) spinlock_t l = SPIN_LOCK_UNLOCKED
+#define DECLARE_LOCK(lockname) DEFINE_SPINLOCK(lockname)
 #define DECLARE_LOCK_EXTERN(l) extern spinlock_t l
 #define DECLARE_RWLOCK(l) rwlock_t l = RW_LOCK_UNLOCKED
 #define DECLARE_RWLOCK_EXTERN(l) extern rwlock_t l