summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gray <jsg@jsg.id.au>2013-03-15 12:46:06 +1100
committerJonathan Gray <jsg@jsg.id.au>2013-03-15 12:46:06 +1100
commita7d8a3ed619deb5232ad0b06969a4573dad8681e (patch)
treec21b9e66033bf1a53318056d3eb49d7f11761653
parentb00dabcf247a54296354e795746377eaea654744 (diff)
Revert "allow multiple aperture opens for kms debugging"
This reverts commit 221d1391e48b019d0955bc2e3aa9261e6523afb9.
-rw-r--r--sys/arch/amd64/amd64/mem.c3
-rw-r--r--sys/arch/i386/i386/mem.c3
2 files changed, 0 insertions, 6 deletions
diff --git a/sys/arch/amd64/amd64/mem.c b/sys/arch/amd64/amd64/mem.c
index 57cc7f88ff7..9a20c20c33f 100644
--- a/sys/arch/amd64/amd64/mem.c
+++ b/sys/arch/amd64/amd64/mem.c
@@ -104,12 +104,9 @@ mmopen(dev_t dev, int flag, int mode, struct proc *p)
if (suser(p, 0) != 0 || !allowaperture)
return (EPERM);
-#if 0
- /* XXX disabled for kms debugging */
/* authorize only one simultaneous open() */
if (ap_open_count > 0)
return(EPERM);
-#endif
ap_open_count++;
break;
#endif
diff --git a/sys/arch/i386/i386/mem.c b/sys/arch/i386/i386/mem.c
index d6bfb520d02..fb64e1ec472 100644
--- a/sys/arch/i386/i386/mem.c
+++ b/sys/arch/i386/i386/mem.c
@@ -90,12 +90,9 @@ mmopen(dev_t dev, int flag, int mode, struct proc *p)
if (suser(p, 0) != 0 || !allowaperture)
return (EPERM);
-#if 0
- /* XXX disabled for kms debugging */
/* authorize only one simultaneous open() */
if (ap_open_count > 0)
return(EPERM);
-#endif
ap_open_count++;
break;
#endif