Module Name: src
Committed By: riastradh
Date: Wed Jul 24 02:32:56 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/dist/include/drm [riastradh-drm2]: drmP.h
Log Message:
Tweak struct drm_lock_data.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.29 -r1.1.1.1.2.30 \
src/sys/external/bsd/drm2/dist/include/drm/drmP.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/include/drm/drmP.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.1.1.1.2.29 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.1.1.1.2.30
--- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.1.1.1.2.29 Wed Jul 24 02:32:10 2013
+++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Wed Jul 24 02:32:56 2013
@@ -541,11 +541,18 @@ struct drm_lock_data {
#else
wait_queue_head_t lock_queue; /**< Queue of blocked processes */
#endif
+#ifndef __NetBSD__ /* XXX nothing seems to use this */
unsigned long lock_time; /**< Time of last lock in jiffies */
+#endif
spinlock_t spinlock;
+#ifdef __NetBSD__
+ unsigned int n_kernel_waiters;
+ drm_waitqueue_t kernel_lock_queue;
+#else
uint32_t kernel_waiters;
uint32_t user_waiters;
int idle_has_lock;
+#endif
};
/**
