vserver 1.9.5.x5

[linux-2.6.git] / drivers / char / drm / drm_memory_debug.h

diff --git a/drivers/char/drm/drm_memory_debug.h b/drivers/char/drm/drm_memory_debug.h
index 0053679..2c82e69 100644 (file)
--- a/drivers/char/drm/drm_memory_debug.h
+++ b/drivers/char/drm/drm_memory_debug.h
@@ -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)[]   = {
@@ -167,7 +167,7 @@ void *DRM(alloc)(size_t size, int area)
        return pt;
 }
 
-void *DRM(calloc)(size_t size, size_t nmemb, int area)
+void *DRM(calloc)(size_t nmemb, size_t size, int area)
 {
        void *addr;