Sorry again. I'm feeling stupid and looking for the big hole to vanish.
Sorry guys for making noise. I messed up the trees. The previous one
was against 2.6.10. I also fixed the requested patchsplits and maintainer
address changes
tglx
Use the new lock initializers DEFINE_SPIN_LOCK and DEFINE_RW_LOCK
Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>
---
drm_auth.c | 2 +-
drm_memory_debug.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff -urN linux-2.6.11-rc1.orig/drivers/char/drm/drm_auth.c
linux-2.6.11-rc1-l4/drivers/char/drm/drm_auth.c
--- linux-2.6.11-rc1.orig/drivers/char/drm/drm_auth.c 2005-01-12
22:56:01.000000000 +0100
+++ linux-2.6.11-rc1-l4/drivers/char/drm/drm_auth.c 2005-01-12
23:00:19.000000000 +0100
@@ -174,7 +174,7 @@
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 -urN linux-2.6.11-rc1.orig/drivers/char/drm/drm_memory_debug.h
linux-2.6.11-rc1-l4/drivers/char/drm/drm_memory_debug.h
--- linux-2.6.11-rc1.orig/drivers/char/drm/drm_memory_debug.h 2005-01-12
22:56:01.000000000 +0100
+++ linux-2.6.11-rc1-l4/drivers/char/drm/drm_memory_debug.h 2005-01-12
23:00:20.000000000 +0100
@@ -43,7 +43,7 @@
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)[] = {
-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt
--
_______________________________________________
Dri-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/dri-devel
