a few more

This commit is contained in:
Alan Hourihane 2001-08-24 10:56:31 +00:00
parent 2bf75c8be3
commit 50d352877c
14 changed files with 18 additions and 32 deletions

View file

@ -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 );
}

View file

@ -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;
}

View file

@ -162,7 +162,7 @@ int DRM(setunique)( DRM_OS_IOCTL )
}
} while(0);
#endif
#endif
#endif /* __linux__ */
return 0;
}

View file

@ -33,19 +33,12 @@
#ifdef __linux__
#define __NO_VERSION__
#include <linux/interrupt.h> /* 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)
{

View file

@ -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 );
}

View file

@ -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;
}

View file

@ -162,7 +162,7 @@ int DRM(setunique)( DRM_OS_IOCTL )
}
} while(0);
#endif
#endif
#endif /* __linux__ */
return 0;
}

View file

@ -34,7 +34,7 @@
#define __NO_VERSION__
#include <linux/interrupt.h> /* For task queue support */
#include <linux/delay.h>
#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]];

View file

@ -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"

View file

@ -33,19 +33,12 @@
#ifdef __linux__
#define __NO_VERSION__
#include <linux/interrupt.h> /* 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)
{

View file

@ -36,7 +36,7 @@
#ifdef __linux__
#include <linux/interrupt.h> /* For task queue support */
#include <linux/delay.h>
#endif
#endif /* __linux__ */
#define R128_FIFO_DEBUG 0

View file

@ -30,7 +30,7 @@
#ifdef __linux__
#define __NO_VERSION__
#include <linux/delay.h>
#endif
#endif /* __linux__ */
#include "radeon.h"
#include "drmP.h"
#include "radeon_drv.h"

View file

@ -37,7 +37,7 @@
#define DRM(x) sisdrv_##x
#else
#define DRM(x) sis_##x
#endif
#endif /* __linux__ */
/* General customization:
*/

View file

@ -38,7 +38,7 @@
#include <linux/poll.h>
#include <asm/io.h>
#include <linux/pci.h>
#endif
#endif /* __linux__ */
#include "sis.h"
#include "drmP.h"