fixes from kernel for 0 vs NULL - mika

diff --git a/linux-core/drm_dma.c b/linux-core/drm_dma.c
index f36cd1c..14ae554 100644 (file)
--- a/linux-core/drm_dma.c
+++ b/linux-core/drm_dma.c
@@ -153,7 +153,7 @@ void DRM(free_buffer)(drm_device_t *dev, drm_buf_t *buf)
 
        buf->waiting  = 0;
        buf->pending  = 0;
-       buf->filp     = 0;
+       buf->filp     = NULL;
        buf->used     = 0;
 
        if ( __HAVE_DMA_WAITQUEUE && waitqueue_active(&buf->dma_wait)) {

diff --git a/linux-core/drm_lock.c b/linux-core/drm_lock.c
index 29db107..f6b887b 100644 (file)
--- a/linux-core/drm_lock.c
+++ b/linux-core/drm_lock.c
@@ -96,7 +96,7 @@ int DRM(lock_transfer)(drm_device_t *dev,
 {
        unsigned int old, new, prev;
 
-       dev->lock.filp = 0;
+       dev->lock.filp = NULL;
        do {
                old  = *lock;
                new  = context | _DRM_LOCK_HELD;
@@ -121,7 +121,7 @@ int DRM(lock_free)(drm_device_t *dev,
 {
        unsigned int old, new, prev;
 
-       dev->lock.filp = 0;
+       dev->lock.filp = NULL;
        do {
                old  = *lock;
                new  = 0;

diff --git a/linux-core/i830_dma.c b/linux-core/i830_dma.c
index 48c6ef5..8cd76cf 100644 (file)
--- a/linux-core/i830_dma.c
+++ b/linux-core/i830_dma.c
@@ -178,7 +178,7 @@ static int i830_map_buffer(drm_buf_t *buf, struct file *filp)
                /* Real error */
                DRM_ERROR("mmap error\n");
                retcode = PTR_ERR(buf_priv->virtual);
-               buf_priv->virtual = 0;
+               buf_priv->virtual = NULL;
        }
        up_write( &current->mm->mmap_sem );
 
@@ -200,7 +200,7 @@ static int i830_unmap_buffer(drm_buf_t *buf)
        up_write(&current->mm->mmap_sem);
 
        buf_priv->currently_mapped = I830_BUF_UNMAPPED;
-       buf_priv->virtual = 0;
+       buf_priv->virtual = NULL;
 
        return retcode;
 }

diff --git a/linux/drm_dma.h b/linux/drm_dma.h
index f36cd1c..14ae554 100644 (file)
--- a/linux/drm_dma.h
+++ b/linux/drm_dma.h
@@ -153,7 +153,7 @@ void DRM(free_buffer)(drm_device_t *dev, drm_buf_t *buf)
 
        buf->waiting  = 0;
        buf->pending  = 0;
-       buf->filp     = 0;
+       buf->filp     = NULL;
        buf->used     = 0;
 
        if ( __HAVE_DMA_WAITQUEUE && waitqueue_active(&buf->dma_wait)) {

diff --git a/linux/drm_lock.h b/linux/drm_lock.h
index 29db107..f6b887b 100644 (file)
--- a/linux/drm_lock.h
+++ b/linux/drm_lock.h
@@ -96,7 +96,7 @@ int DRM(lock_transfer)(drm_device_t *dev,
 {
        unsigned int old, new, prev;
 
-       dev->lock.filp = 0;
+       dev->lock.filp = NULL;
        do {
                old  = *lock;
                new  = context | _DRM_LOCK_HELD;
@@ -121,7 +121,7 @@ int DRM(lock_free)(drm_device_t *dev,
 {
        unsigned int old, new, prev;
 
-       dev->lock.filp = 0;
+       dev->lock.filp = NULL;
        do {
                old  = *lock;
                new  = 0;

diff --git a/linux/i830_dma.c b/linux/i830_dma.c
index 48c6ef5..8cd76cf 100644 (file)
--- a/linux/i830_dma.c
+++ b/linux/i830_dma.c
@@ -178,7 +178,7 @@ static int i830_map_buffer(drm_buf_t *buf, struct file *filp)
                /* Real error */
                DRM_ERROR("mmap error\n");
                retcode = PTR_ERR(buf_priv->virtual);
-               buf_priv->virtual = 0;
+               buf_priv->virtual = NULL;
        }
        up_write( &current->mm->mmap_sem );
 
@@ -200,7 +200,7 @@ static int i830_unmap_buffer(drm_buf_t *buf)
        up_write(&current->mm->mmap_sem);
 
        buf_priv->currently_mapped = I830_BUF_UNMAPPED;
-       buf_priv->virtual = 0;
+       buf_priv->virtual = NULL;
 
        return retcode;
 }