diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2006-02-02 19:37:46 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-02-02 19:37:46 +1100 |
| commit | 30e2fb188194908e48d3f27a53ccea6740eb1e98 (patch) | |
| tree | eef1e9495aa6db6cddc67cf7f20369a3acdd2291 /drivers/char/drm/drmP.h | |
| parent | ce60fe02fbe737cbce09e2ba5a2ef1efd20eff73 (diff) | |
| download | op-kernel-dev-30e2fb188194908e48d3f27a53ccea6740eb1e98.zip op-kernel-dev-30e2fb188194908e48d3f27a53ccea6740eb1e98.tar.gz | |
sem2mutex: drivers/char/drm/
From: Arjan van de Ven <arjan@infradead.org>
Semaphore to mutex conversion.
The conversion was generated via scripts, and the result was validated
automatically via a script as well.
Signed-off-by: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/drmP.h')
| -rw-r--r-- | drivers/char/drm/drmP.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h index 54b561e..71b8b32 100644 --- a/drivers/char/drm/drmP.h +++ b/drivers/char/drm/drmP.h @@ -57,6 +57,7 @@ #include <linux/smp_lock.h> /* For (un)lock_kernel */ #include <linux/mm.h> #include <linux/cdev.h> +#include <linux/mutex.h> #if defined(__alpha__) || defined(__powerpc__) #include <asm/pgtable.h> /* For pte_wrprotect */ #endif @@ -623,7 +624,7 @@ typedef struct drm_device { /** \name Locks */ /*@{ */ spinlock_t count_lock; /**< For inuse, drm_device::open_count, drm_device::buf_use */ - struct semaphore struct_sem; /**< For others */ + struct mutex struct_mutex; /**< For others */ /*@} */ /** \name Usage Counters */ @@ -658,7 +659,7 @@ typedef struct drm_device { /*@{ */ drm_ctx_list_t *ctxlist; /**< Linked list of context handles */ int ctx_count; /**< Number of context handles */ - struct semaphore ctxlist_sem; /**< For ctxlist */ + struct mutex ctxlist_mutex; /**< For ctxlist */ drm_map_t **context_sareas; /**< per-context SAREA's */ int max_context; |
