Module Name: src
Committed By: snj
Date: Fri Aug 14 21:40:49 UTC 2009
Modified Files:
src/sys/external/bsd/drm/dist/bsd-core [netbsd-5]: drmP.h drm_fops.c
Log Message:
Pull up following revision(s) (requested by mrg in ticket #907):
sys/external/bsd/drm/dist/bsd-core/drm_fops.c: revision 1.6
sys/external/bsd/drm/dist/bsd-core/drmP.h: revision 1.13
remove some netbsd specific code that does nothing.
To generate a diff of this commit:
cvs rdiff -u -r1.9.10.1 -r1.9.10.2 \
src/sys/external/bsd/drm/dist/bsd-core/drmP.h
cvs rdiff -u -r1.2.10.1 -r1.2.10.2 \
src/sys/external/bsd/drm/dist/bsd-core/drm_fops.c
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/drm/dist/bsd-core/drmP.h
diff -u src/sys/external/bsd/drm/dist/bsd-core/drmP.h:1.9.10.1 src/sys/external/bsd/drm/dist/bsd-core/drmP.h:1.9.10.2
--- src/sys/external/bsd/drm/dist/bsd-core/drmP.h:1.9.10.1 Sat Jun 20 23:36:59 2009
+++ src/sys/external/bsd/drm/dist/bsd-core/drmP.h Fri Aug 14 21:40:49 2009
@@ -582,9 +582,6 @@
int minor;
pid_t pid;
uid_t uid;
-#if defined(__NetBSD__)
- int refs;
-#endif
drm_magic_t magic;
unsigned long ioctl_count;
void *driver_priv;
Index: src/sys/external/bsd/drm/dist/bsd-core/drm_fops.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/drm_fops.c:1.2.10.1 src/sys/external/bsd/drm/dist/bsd-core/drm_fops.c:1.2.10.2
--- src/sys/external/bsd/drm/dist/bsd-core/drm_fops.c:1.2.10.1 Sat Jun 20 23:36:59 2009
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_fops.c Fri Aug 14 21:40:49 2009
@@ -70,9 +70,7 @@
DRM_LOCK();
priv = drm_find_file_by_proc(dev, p);
- if (priv) {
- priv->refs++;
- } else {
+ if (!priv) {
priv = malloc(sizeof(*priv), DRM_MEM_FILES, M_NOWAIT | M_ZERO);
if (priv == NULL) {
DRM_UNLOCK();
@@ -81,7 +79,6 @@
priv->uid = kauth_cred_getsvuid(p->p_cred);
priv->pid = p->p_pid;
- priv->refs = 1;
priv->minor = m;
priv->ioctl_count = 0;
