summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
authorJon Smirl <jonsmirl@yahoo.com>2004-03-12 21:22:52 +0000
committerJon Smirl <jonsmirl@yahoo.com>2004-03-12 21:22:52 +0000
commit24115068e465cf0d788d870a3c1c24bb68a9cb14 (patch)
tree419ce4e7f37af3a1f6ce5e18f7cc266006b9036d /linux-core
parentf47ed991432672b7353e73b9d3194f255b957bee (diff)
Fixes need to clean up the mess I made with the mesa merge. This code
allows the mesa drivers to use a single definition of the DRM sarea/IOCTLS located in the drm driver directory. Adjustments were made to the 2D drivers to not include these changes. Changes to the mesa copy of DRM were copied to the DRI copy. XFree86 bug: Reported by: Submitted by: Reviewed by: Obtained from:
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/drmP.h12
1 files changed, 0 insertions, 12 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h
index c2c14dbd..e35e60b3 100644
--- a/linux-core/drmP.h
+++ b/linux-core/drmP.h
@@ -505,18 +505,6 @@ typedef struct drm_buf_entry {
drm_freelist_t freelist;
} drm_buf_entry_t;
-/**
- * Hardware lock.
- *
- * The lock structure is a simple cache-line aligned integer. To avoid
- * processor bus contention on a multiprocessor system, there should not be any
- * other data stored in the same cache line.
- */
-typedef struct drm_hw_lock {
- __volatile__ unsigned int lock; /**< lock variable */
- char padding[60]; /**< Pad to cache line */
-} drm_hw_lock_t;
-
/** File private data */
typedef struct drm_file {
int authenticated;