From 50d352877c6c114350cc3e0e44edae924f146a13 Mon Sep 17 00:00:00 2001 From: Alan Hourihane Date: Fri, 24 Aug 2001 10:56:31 +0000 Subject: [PATCH] a few more --- linux-core/drm_context.c | 2 +- linux-core/drm_init.c | 2 +- linux-core/drm_ioctl.c | 2 +- linux-core/i810_dma.c | 11 ++--------- linux/drm_context.h | 2 +- linux/drm_init.h | 2 +- linux/drm_ioctl.h | 2 +- linux/gamma_dma.c | 6 +++--- linux/gamma_drv.c | 2 +- linux/i810_dma.c | 11 ++--------- linux/r128_cce.c | 2 +- linux/radeon_state.c | 2 +- linux/sis.h | 2 +- linux/sis_ds.c | 2 +- 14 files changed, 18 insertions(+), 32 deletions(-) diff --git a/linux-core/drm_context.c b/linux-core/drm_context.c index e8405b94..79cb1360 100644 --- a/linux-core/drm_context.c +++ b/linux-core/drm_context.c @@ -386,7 +386,7 @@ int DRM(rmctx)( DRM_OS_IOCTL ) if ( ctx.handle == DRM_KERNEL_CONTEXT + 1 ) { priv->remove_auth_on_close = 1; } -#endif +#endif /* __linux__ */ if ( ctx.handle != DRM_KERNEL_CONTEXT ) { DRM(ctxbitmap_free)( dev, ctx.handle ); } diff --git a/linux-core/drm_init.c b/linux-core/drm_init.c index 4e5bac17..7162612d 100644 --- a/linux-core/drm_init.c +++ b/linux-core/drm_init.c @@ -113,6 +113,6 @@ int DRM(cpu_valid)(void) #if defined(__sparc__) && !defined(__sparc_v9__) return 0; /* No cmpxchg before v9 sparc. */ #endif -#endif +#endif /* __linux__ */ return 1; } diff --git a/linux-core/drm_ioctl.c b/linux-core/drm_ioctl.c index 82faaec9..c3de80bb 100644 --- a/linux-core/drm_ioctl.c +++ b/linux-core/drm_ioctl.c @@ -162,7 +162,7 @@ int DRM(setunique)( DRM_OS_IOCTL ) } } while(0); #endif -#endif +#endif /* __linux__ */ return 0; } diff --git a/linux-core/i810_dma.c b/linux-core/i810_dma.c index 448e773c..80aae3ab 100644 --- a/linux-core/i810_dma.c +++ b/linux-core/i810_dma.c @@ -33,19 +33,12 @@ #ifdef __linux__ #define __NO_VERSION__ #include /* For task queue support */ -#endif +#endif /* __linux__ */ #include "i810.h" #include "drmP.h" #include "i810_drv.h" -/* in case we don't have a 2.3.99-pre6 kernel or later: */ -#ifdef __linux__ -#ifndef VM_DONTCOPY -#define VM_DONTCOPY 0 -#endif -#endif - #define I810_BUF_FREE 2 #define I810_BUF_CLIENT 1 #define I810_BUF_HARDWARE 0 @@ -148,7 +141,7 @@ static struct file_operations i810_buffer_fops = { fasync: DRM(fasync), poll: DRM(poll), }; -#endif +#endif /* __linux__ */ int i810_mmap_buffers(struct file *filp, struct vm_area_struct *vma) { diff --git a/linux/drm_context.h b/linux/drm_context.h index e8405b94..79cb1360 100644 --- a/linux/drm_context.h +++ b/linux/drm_context.h @@ -386,7 +386,7 @@ int DRM(rmctx)( DRM_OS_IOCTL ) if ( ctx.handle == DRM_KERNEL_CONTEXT + 1 ) { priv->remove_auth_on_close = 1; } -#endif +#endif /* __linux__ */ if ( ctx.handle != DRM_KERNEL_CONTEXT ) { DRM(ctxbitmap_free)( dev, ctx.handle ); } diff --git a/linux/drm_init.h b/linux/drm_init.h index 4e5bac17..7162612d 100644 --- a/linux/drm_init.h +++ b/linux/drm_init.h @@ -113,6 +113,6 @@ int DRM(cpu_valid)(void) #if defined(__sparc__) && !defined(__sparc_v9__) return 0; /* No cmpxchg before v9 sparc. */ #endif -#endif +#endif /* __linux__ */ return 1; } diff --git a/linux/drm_ioctl.h b/linux/drm_ioctl.h index 82faaec9..c3de80bb 100644 --- a/linux/drm_ioctl.h +++ b/linux/drm_ioctl.h @@ -162,7 +162,7 @@ int DRM(setunique)( DRM_OS_IOCTL ) } } while(0); #endif -#endif +#endif /* __linux__ */ return 0; } diff --git a/linux/gamma_dma.c b/linux/gamma_dma.c index 7f8faffc..eeebcdfa 100644 --- a/linux/gamma_dma.c +++ b/linux/gamma_dma.c @@ -34,7 +34,7 @@ #define __NO_VERSION__ #include /* For task queue support */ #include -#endif +#endif /* __linux__ */ #include "gamma.h" #include "drmP.h" @@ -455,7 +455,7 @@ static int gamma_dma_priority(drm_device_t *dev, drm_dma_t *d) #ifdef __linux__ add_wait_queue(&dev->context_wait, &entry); current->state = TASK_INTERRUPTIBLE; -#endif +#endif /* __linux__ */ /* PRE: dev->last_context != buf->context */ DRM(context_switch)(dev, dev->last_context, buf->context); @@ -524,7 +524,7 @@ static int gamma_dma_send_buffers(drm_device_t *dev, drm_dma_t *d) drm_device_dma_t *dma = dev->dma; #ifdef __linux__ DECLARE_WAITQUEUE(entry, current); -#endif +#endif /* __linux__ */ if (d->flags & _DRM_DMA_BLOCK) { last_buf = dma->buflist[d->send_indices[d->send_count-1]]; diff --git a/linux/gamma_drv.c b/linux/gamma_drv.c index bf178a3d..127a7943 100644 --- a/linux/gamma_drv.c +++ b/linux/gamma_drv.c @@ -100,7 +100,7 @@ static int __init gamma_options( char *str ) __setup( DRIVER_NAME "=", gamma_options ); #endif -#endif +#endif /* __linux__ */ #include "drm_fops.h" #include "drm_init.h" diff --git a/linux/i810_dma.c b/linux/i810_dma.c index 448e773c..80aae3ab 100644 --- a/linux/i810_dma.c +++ b/linux/i810_dma.c @@ -33,19 +33,12 @@ #ifdef __linux__ #define __NO_VERSION__ #include /* For task queue support */ -#endif +#endif /* __linux__ */ #include "i810.h" #include "drmP.h" #include "i810_drv.h" -/* in case we don't have a 2.3.99-pre6 kernel or later: */ -#ifdef __linux__ -#ifndef VM_DONTCOPY -#define VM_DONTCOPY 0 -#endif -#endif - #define I810_BUF_FREE 2 #define I810_BUF_CLIENT 1 #define I810_BUF_HARDWARE 0 @@ -148,7 +141,7 @@ static struct file_operations i810_buffer_fops = { fasync: DRM(fasync), poll: DRM(poll), }; -#endif +#endif /* __linux__ */ int i810_mmap_buffers(struct file *filp, struct vm_area_struct *vma) { diff --git a/linux/r128_cce.c b/linux/r128_cce.c index 8b95a936..9c0c3538 100644 --- a/linux/r128_cce.c +++ b/linux/r128_cce.c @@ -36,7 +36,7 @@ #ifdef __linux__ #include /* For task queue support */ #include -#endif +#endif /* __linux__ */ #define R128_FIFO_DEBUG 0 diff --git a/linux/radeon_state.c b/linux/radeon_state.c index 35168ab4..154aa3e6 100644 --- a/linux/radeon_state.c +++ b/linux/radeon_state.c @@ -30,7 +30,7 @@ #ifdef __linux__ #define __NO_VERSION__ #include -#endif +#endif /* __linux__ */ #include "radeon.h" #include "drmP.h" #include "radeon_drv.h" diff --git a/linux/sis.h b/linux/sis.h index e5e7ec80..cf45f772 100644 --- a/linux/sis.h +++ b/linux/sis.h @@ -37,7 +37,7 @@ #define DRM(x) sisdrv_##x #else #define DRM(x) sis_##x -#endif +#endif /* __linux__ */ /* General customization: */ diff --git a/linux/sis_ds.c b/linux/sis_ds.c index dba169d4..fbb985d3 100644 --- a/linux/sis_ds.c +++ b/linux/sis_ds.c @@ -38,7 +38,7 @@ #include #include #include -#endif +#endif /* __linux__ */ #include "sis.h" #include "drmP.h"