Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2005-01-20 16:25:16 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-01-20 16:25:16 -0800
commita0f4d6c75981728d1f90f69cba3e8d67c37641c6 (patch)
treeee71b8e7b8601600779778826db960a264b32ca2
parent4b8284bde61a7e10809f2174791a482ec009cec0 (diff)
[PATCH] Lock initializer cleanup: FRV
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/frv/kernel/dma.c2
-rw-r--r--arch/frv/mb93090-mb00/pci-dma-nommu.c2
-rw-r--r--arch/frv/mm/mmu-context.c2
-rw-r--r--arch/frv/mm/pgalloc.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/frv/kernel/dma.c b/arch/frv/kernel/dma.c
index 99b3a62aa8c2..f5de6cf7df4e 100644
--- a/arch/frv/kernel/dma.c
+++ b/arch/frv/kernel/dma.c
@@ -107,7 +107,7 @@ static struct frv_dma_channel frv_dma_channels[FRV_DMA_NCHANS] = {
},
};
-static rwlock_t frv_dma_channels_lock = RW_LOCK_UNLOCKED;
+static DEFINE_RWLOCK(frv_dma_channels_lock);
unsigned long frv_dma_inprogress;
diff --git a/arch/frv/mb93090-mb00/pci-dma-nommu.c b/arch/frv/mb93090-mb00/pci-dma-nommu.c
index 794cfe516552..819895cf0b9e 100644
--- a/arch/frv/mb93090-mb00/pci-dma-nommu.c
+++ b/arch/frv/mb93090-mb00/pci-dma-nommu.c
@@ -30,7 +30,7 @@ struct dma_alloc_record {
unsigned long len;
};
-static spinlock_t dma_alloc_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(dma_alloc_lock);
static LIST_HEAD(dma_alloc_list);
void *dma_alloc_coherent(struct device *hwdev, size_t size, dma_addr_t *dma_handle, int gfp)
diff --git a/arch/frv/mm/mmu-context.c b/arch/frv/mm/mmu-context.c
index c8bd7c9391d7..f2c6866fc88b 100644
--- a/arch/frv/mm/mmu-context.c
+++ b/arch/frv/mm/mmu-context.c
@@ -17,7 +17,7 @@
static unsigned long cxn_bitmap[NR_CXN / (sizeof(unsigned long) * 8)];
static LIST_HEAD(cxn_owners_lru);
-static spinlock_t cxn_owners_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(cxn_owners_lock);
int __nongpreldata cxn_pinned = -1;
diff --git a/arch/frv/mm/pgalloc.c b/arch/frv/mm/pgalloc.c
index 8b9e7092eca0..4eaec0f3525b 100644
--- a/arch/frv/mm/pgalloc.c
+++ b/arch/frv/mm/pgalloc.c
@@ -77,7 +77,7 @@ void __set_pmd(pmd_t *pmdptr, unsigned long pmd)
* manfred's recommendations and having no core impact whatsoever.
* -- wli
*/
-spinlock_t pgd_lock = SPIN_LOCK_UNLOCKED;
+DEFINE_SPINLOCK(pgd_lock);
struct page *pgd_list;
static inline void pgd_list_add(pgd_t *pgd)