From: Thomas Gleixner <tglx@linutronix.de>
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>
---
25-akpm/drivers/char/drm/drm_auth.c | 2 +-
25-akpm/drivers/char/drm/drm_memory_debug.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff -puN drivers/char/drm/drm_auth.c~lock-initializer-cleanup-drm drivers/char/drm/drm_auth.c
--- 25/drivers/char/drm/drm_auth.c~lock-initializer-cleanup-drm Wed Jan 12 16:54:47 2005
+++ 25-akpm/drivers/char/drm/drm_auth.c Wed Jan 12 16:54:47 2005
@@ -174,7 +174,7 @@ int drm_getmagic(struct inode *inode, st
unsigned int cmd, unsigned long arg)
{
static drm_magic_t sequence = 0;
- static spinlock_t lock = SPIN_LOCK_UNLOCKED;
+ static DEFINE_SPINLOCK(lock);
drm_file_t *priv = filp->private_data;
drm_device_t *dev = priv->dev;
drm_auth_t auth;
diff -puN drivers/char/drm/drm_memory_debug.h~lock-initializer-cleanup-drm drivers/char/drm/drm_memory_debug.h
--- 25/drivers/char/drm/drm_memory_debug.h~lock-initializer-cleanup-drm Wed Jan 12 16:54:47 2005
+++ 25-akpm/drivers/char/drm/drm_memory_debug.h Wed Jan 12 16:54:47 2005
@@ -43,7 +43,7 @@ typedef struct drm_mem_stats {
unsigned long bytes_freed;
} drm_mem_stats_t;
-static spinlock_t DRM(mem_lock) = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(DRM(mem_lock));
static unsigned long DRM(ram_available) = 0; /* In pages */
static unsigned long DRM(ram_used) = 0;
static drm_mem_stats_t DRM(mem_stats)[] = {
_