Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2005-01-20 16:18:20 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-01-20 16:18:20 -0800
commita93352c98378bec95647cf1e75b25734dca4bf01 (patch)
tree6955e4f1df05a5626e930cfb72c39f0d3a0f14b7
parenta2fea16f663ddc54d4a412cbef62560ec7f126e5 (diff)
[PATCH] Lock initializer cleanup: S390
Use the new lock initializers DEFINE_SPIN_LOCK and DEFINE_RW_LOCK Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/s390/appldata/appldata_base.c4
-rw-r--r--arch/s390/kernel/cpcmd.c2
-rw-r--r--arch/s390/kernel/smp.c4
-rw-r--r--arch/s390/kernel/traps.c2
-rw-r--r--arch/s390/mm/extmem.c2
5 files changed, 7 insertions, 7 deletions
diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c
index 3589f48ded47..01ae1964c938 100644
--- a/arch/s390/appldata/appldata_base.c
+++ b/arch/s390/appldata/appldata_base.c
@@ -128,7 +128,7 @@ static struct ctl_table appldata_dir_table[] = {
DEFINE_PER_CPU(struct vtimer_list, appldata_timer);
static atomic_t appldata_expire_count = ATOMIC_INIT(0);
-static spinlock_t appldata_timer_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(appldata_timer_lock);
static int appldata_interval = APPLDATA_CPU_INTERVAL;
static int appldata_timer_active;
@@ -140,7 +140,7 @@ static struct tasklet_struct appldata_tasklet_struct;
/*
* Ops list
*/
-static spinlock_t appldata_ops_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(appldata_ops_lock);
static LIST_HEAD(appldata_ops_list);
diff --git a/arch/s390/kernel/cpcmd.c b/arch/s390/kernel/cpcmd.c
index 9957926bcb22..2b567f7d34a3 100644
--- a/arch/s390/kernel/cpcmd.c
+++ b/arch/s390/kernel/cpcmd.c
@@ -14,7 +14,7 @@
#include <asm/cpcmd.h>
#include <asm/system.h>
-static spinlock_t cpcmd_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(cpcmd_lock);
static char cpcmd_buf[240];
void cpcmd(char *cmd, char *response, int rlen)
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index d2c61ca2b530..24550d2cea8a 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -76,7 +76,7 @@ static void smp_ext_bitcall_others(ec_bit_sig);
* Structure and data for smp_call_function(). This is designed to minimise
* static memory requirements. It also looks cleaner.
*/
-static spinlock_t call_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(call_lock);
struct call_data_struct {
void (*func) (void *info);
@@ -566,7 +566,7 @@ static void __init smp_create_idle(unsigned int cpu)
/* Reserving and releasing of CPUs */
-static spinlock_t smp_reserve_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(smp_reserve_lock);
static int smp_cpu_reserved[NR_CPUS];
int
diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c
index 6451cec056d1..8b90e9528b91 100644
--- a/arch/s390/kernel/traps.c
+++ b/arch/s390/kernel/traps.c
@@ -273,7 +273,7 @@ char *task_show_regs(struct task_struct *task, char *buffer)
return buffer;
}
-spinlock_t die_lock = SPIN_LOCK_UNLOCKED;
+DEFINE_SPINLOCK(die_lock);
void die(const char * str, struct pt_regs * regs, long err)
{
diff --git a/arch/s390/mm/extmem.c b/arch/s390/mm/extmem.c
index efb6aae830b0..d1d0e11ec816 100644
--- a/arch/s390/mm/extmem.c
+++ b/arch/s390/mm/extmem.c
@@ -77,7 +77,7 @@ struct dcss_segment {
int segcnt;
};
-static spinlock_t dcss_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(dcss_lock);
static struct list_head dcss_list = LIST_HEAD_INIT(dcss_list);
static char *segtype_string[] = { "SW", "EW", "SR", "ER", "SN", "EN", "SC",
"EW/EN-MIXED" };