diff options
| author | Adrian Bunk <bunk@stusta.de> | 2006-02-03 23:49:49 +0100 |
|---|---|---|
| committer | Adrian Bunk <bunk@r063144.stusta.swh.mhn.de> | 2006-02-03 23:49:49 +0100 |
| commit | 01d206a7c1167639f6ca6dac22140fbdca017558 (patch) | |
| tree | bc3ccf1a8140a7f787c4728cfa4c30e65ad56eb2 /drivers/char/drm/drmP.h | |
| parent | 9c4b562abc9005e4b413de02c85d3d29da707cba (diff) | |
| parent | d6c8f6aaa1d7f68c1e6471ab0839d9047cdd159f (diff) | |
| download | kernel-crypto-01d206a7c1167639f6ca6dac22140fbdca017558.tar.gz kernel-crypto-01d206a7c1167639f6ca6dac22140fbdca017558.tar.xz kernel-crypto-01d206a7c1167639f6ca6dac22140fbdca017558.zip | |
Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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 54b561e6948..71b8b32b075 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; |