diff --git a/arch/frv/kernel/dma.c b/arch/frv/kernel/dma.c
index 99b3a62aa8c2ad98fd525b789a26bdea13c47134..f5de6cf7df4e751be20f5c2b1714a3a3e1db0024 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 794cfe51655220c804a6733fe54988fb1428e2b1..819895cf0b9eda0c773022cd347bf5d18dfb7e2d 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 c8bd7c9391d77f50f07353d5e04326f7aeda17b8..f2c6866fc88b93e1ffb6a3edf9ece5d6376e270b 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 8b9e7092eca0e89f3b75ed36b0de2092939ce1cf..4eaec0f3525b24e982ed1c59ad973b1457a77372 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)