adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 19:56:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PATCH] more SPIN_LOCK_UNLOCKED -> DEFINE_SPINLOCK conversions

Browse source 
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 <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Ingo Molnar 2005-09-09 13:10:41 -07:00 committed by Linus Torvalds
parent 8d06afab73
commit a9f6a0dd54
17 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/mach-pxa/corgi_ssp.c
View file

@ -22,7 +22,7 @@
#include <asm/arch/corgi.h> #include <asm/arch/corgi.h>
#include <asm/arch/pxa-regs.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_dev corgi_ssp_dev;
static struct ssp_state corgi_ssp_state; static struct ssp_state corgi_ssp_state;

2
arch/ia64/kernel/perfmon.c
View file

@ -497,7 +497,7 @@ typedef struct {
static pfm_stats_t pfm_stats[NR_CPUS]; static pfm_stats_t pfm_stats[NR_CPUS];
static pfm_session_t pfm_sessions; /* global sessions information */ 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 pfm_intr_handler_desc_t *pfm_alt_intr_handler;
static struct proc_dir_entry *perfmon_dir; static struct proc_dir_entry *perfmon_dir;

2
arch/ia64/sn/kernel/xpnet.c
View file

@ -130,7 +130,7 @@ struct net_device *xpnet_device;
*/ */
static u64 xpnet_broadcast_partitions; static u64 xpnet_broadcast_partitions;
/* protect above */ /* 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 * Since the Block Transfer Engine (BTE) is being used for the transfer

2
arch/mips/kernel/genrtc.c
View file

@ -14,7 +14,7 @@
#include <asm/rtc.h> #include <asm/rtc.h>
#include <asm/time.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) unsigned int get_rtc_time(struct rtc_time *time)
{ {

2
arch/mips/kernel/i8259.c
View file

@ -31,7 +31,7 @@ void disable_8259A_irq(unsigned int irq);
* moves to arch independent land * 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) static void end_8259A_irq (unsigned int irq)
{ {

2
arch/ppc/platforms/hdpu.c
View file

@ -58,7 +58,7 @@ static void parse_bootinfo(unsigned long r3,
static void hdpu_set_l1pe(void); static void hdpu_set_l1pe(void);
static void hdpu_cpustate_set(unsigned char new_state); static void hdpu_cpustate_set(unsigned char new_state);
#ifdef CONFIG_SMP #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; static unsigned int timebase_upper = 0, timebase_lower = 0;
extern int smp_tb_synchronized; extern int smp_tb_synchronized;

2
arch/ppc/syslib/mv64x60.c
View file

@ -31,7 +31,7 @@
u8 mv64x60_pci_exclude_bridge = 1; u8 mv64x60_pci_exclude_bridge = 1;
spinlock_t mv64x60_lock = SPIN_LOCK_UNLOCKED; DEFINE_SPINLOCK(mv64x60_lock);
static phys_addr_t mv64x60_bridge_pbase; static phys_addr_t mv64x60_bridge_pbase;
static void *mv64x60_bridge_vbase; static void *mv64x60_bridge_vbase;

2
arch/ppc/syslib/qspan_pci.c
View file

@ -94,7 +94,7 @@
#define mk_config_type1(bus, dev, offset) \ #define mk_config_type1(bus, dev, offset) \
mk_config_addr(bus, dev, offset) | 1; 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, int qspan_pcibios_read_config_byte(unsigned char bus, unsigned char dev_fn,
unsigned char offset, unsigned char *val) unsigned char offset, unsigned char *val)

2
arch/ppc64/kernel/pmc.c
View file

@ -26,7 +26,7 @@ static void dummy_perf(struct pt_regs *regs)
mtspr(SPRN_MMCR0, mmcr0); 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 */ static void *pmc_owner_caller; /* mostly for debugging */
perf_irq_t perf_irq = dummy_perf; perf_irq_t perf_irq = dummy_perf;

2
arch/sparc/lib/atomic32.c
View file

@ -20,7 +20,7 @@ spinlock_t __atomic_hash[ATOMIC_HASH_SIZE] = {
#else /* SMP */ #else /* SMP */
static spinlock_t dummy = SPIN_LOCK_UNLOCKED; static DEFINE_SPINLOCK(dummy);
#define ATOMIC_HASH_SIZE 1 #define ATOMIC_HASH_SIZE 1
#define ATOMIC_HASH(a) (&dummy) #define ATOMIC_HASH(a) (&dummy)

2
drivers/net/mv643xx_eth.c
View file

@ -94,7 +94,7 @@ static char mv643xx_driver_version[] = "1.0";
static void __iomem *mv643xx_eth_shared_base; static void __iomem *mv643xx_eth_shared_base;
/* used to protect MV643XX_ETH_SMI_REG, which is shared across ports */ /* 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) static inline u32 mv_read(int offset)
{ {

2
drivers/parisc/iosapic.c
View file

@ -215,7 +215,7 @@ static inline void iosapic_write(void __iomem *iosapic, unsigned int reg, u32 va
#define IOSAPIC_IRDT_ID_EID_SHIFT 0x10 #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) static inline void iosapic_eoi(void __iomem *addr, unsigned int data)
{ {

2
drivers/scsi/ch.c
View file

@ -116,7 +116,7 @@ typedef struct {
} scsi_changer; } scsi_changer;
static LIST_HEAD(ch_devlist); 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 int ch_devcount;
static struct scsi_driver ch_template = static struct scsi_driver ch_template =

2
drivers/video/geode/display_gx1.c
View file

@ -22,7 +22,7 @@
#include "geodefb.h" #include "geodefb.h"
#include "display_gx1.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) static u8 gx1_read_conf_reg(u8 reg)
{ {

2
fs/xfs/support/ktrace.c
View file

@ -170,7 +170,7 @@ ktrace_enter(
void *val14, void *val14,
void *val15) void *val15)
{ {
static lock_t wrap_lock = SPIN_LOCK_UNLOCKED; static DEFINE_SPINLOCK(wrap_lock);
unsigned long flags; unsigned long flags;
int index; int index;
ktrace_entry_t *ktep; ktrace_entry_t *ktep;

4
net/core/netpoll.c
View file

@ -645,10 +645,10 @@ int netpoll_setup(struct netpoll *np)
npinfo->rx_flags = 0; npinfo->rx_flags = 0;
npinfo->rx_np = NULL; npinfo->rx_np = NULL;
npinfo->poll_lock = SPIN_LOCK_UNLOCKED; spin_lock_init(&npinfo->poll_lock);
npinfo->poll_owner = -1; npinfo->poll_owner = -1;
npinfo->tries = MAX_RETRIES; npinfo->tries = MAX_RETRIES;
npinfo->rx_lock = SPIN_LOCK_UNLOCKED; spin_lock_init(&npinfo->rx_lock);
} else } else
npinfo = ndev->npinfo; npinfo = ndev->npinfo;

2
net/core/pktgen.c
View file

@ -503,7 +503,7 @@ static int pg_delay_d = 0;
static int pg_clone_skb_d = 0; static int pg_clone_skb_d = 0;
static int debug = 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 struct pktgen_thread *pktgen_threads = NULL;
static char module_fname[128]; static char module_fname[128];