From: Thomas Gleixner Use the new lock initializers DEFINE_SPIN_LOCK and DEFINE_RW_LOCK Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton --- 25-akpm/arch/frv/kernel/dma.c | 2 +- 25-akpm/arch/frv/mb93090-mb00/pci-dma-nommu.c | 2 +- 25-akpm/arch/frv/mm/mmu-context.c | 2 +- 25-akpm/arch/frv/mm/pgalloc.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff -puN arch/frv/kernel/dma.c~lock-initializer-cleanup-frv arch/frv/kernel/dma.c --- 25/arch/frv/kernel/dma.c~lock-initializer-cleanup-frv Wed Jan 12 16:55:11 2005 +++ 25-akpm/arch/frv/kernel/dma.c Wed Jan 12 16:55:11 2005 @@ -107,7 +107,7 @@ static struct frv_dma_channel frv_dma_ch }, }; -static rwlock_t frv_dma_channels_lock = RW_LOCK_UNLOCKED; +static DEFINE_RWLOCK(frv_dma_channels_lock); unsigned long frv_dma_inprogress; diff -puN arch/frv/mb93090-mb00/pci-dma-nommu.c~lock-initializer-cleanup-frv arch/frv/mb93090-mb00/pci-dma-nommu.c --- 25/arch/frv/mb93090-mb00/pci-dma-nommu.c~lock-initializer-cleanup-frv Wed Jan 12 16:55:11 2005 +++ 25-akpm/arch/frv/mb93090-mb00/pci-dma-nommu.c Wed Jan 12 16:55:11 2005 @@ -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 -puN arch/frv/mm/mmu-context.c~lock-initializer-cleanup-frv arch/frv/mm/mmu-context.c --- 25/arch/frv/mm/mmu-context.c~lock-initializer-cleanup-frv Wed Jan 12 16:55:11 2005 +++ 25-akpm/arch/frv/mm/mmu-context.c Wed Jan 12 16:55:11 2005 @@ -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 -puN arch/frv/mm/pgalloc.c~lock-initializer-cleanup-frv arch/frv/mm/pgalloc.c --- 25/arch/frv/mm/pgalloc.c~lock-initializer-cleanup-frv Wed Jan 12 16:55:11 2005 +++ 25-akpm/arch/frv/mm/pgalloc.c Wed Jan 12 16:55:11 2005 @@ -77,7 +77,7 @@ void __set_pmd(pmd_t *pmdptr, unsigned l * 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) _