diff options
| author | Owain Ainsworth <oga@cvs.openbsd.org> | 2011-07-03 18:34:15 +0000 |
|---|---|---|
| committer | Owain Ainsworth <oga@cvs.openbsd.org> | 2011-07-03 18:34:15 +0000 |
| commit | 9ab2af9380379bf897461fdb1e4d46997af234e1 (patch) | |
| tree | 2a99473ad5967b9a05b9c5e2e2925f2c84dcb14f /sys/dev/pci/drm | |
| parent | 298c7a6943ee533ae40ca5edeea32ed1ce315d2b (diff) | |
Rip out and burn support for UVM_HIST.
The vm hackers don't use it, don't maintain it and have to look at it all the
time. About time this 800 lines of code hit /dev/null.
``never liked it'' tedu@. ariane@ was very happy when i told her i wrote
this diff.
Diffstat (limited to 'sys/dev/pci/drm')
| -rw-r--r-- | sys/dev/pci/drm/drm_drv.c | 6 | ||||
| -rw-r--r-- | sys/dev/pci/drm/i915_drv.c | 5 |
2 files changed, 2 insertions, 9 deletions
diff --git a/sys/dev/pci/drm/drm_drv.c b/sys/dev/pci/drm/drm_drv.c index 8349786bcc2..8fc491a16a5 100644 --- a/sys/dev/pci/drm/drm_drv.c +++ b/sys/dev/pci/drm/drm_drv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: drm_drv.c,v 1.95 2011/07/03 15:47:17 matthew Exp $ */ +/* $OpenBSD: drm_drv.c,v 1.96 2011/07/03 18:34:14 oga Exp $ */ /*- * Copyright 2007-2009 Owain G. Ainsworth <oga@openbsd.org> * Copyright © 2008 Intel Corporation @@ -1298,8 +1298,6 @@ drm_fault(struct uvm_faultinfo *ufi, vaddr_t vaddr, vm_page_t *pps, struct drm_obj *obj = (struct drm_obj *)uobj; struct drm_device *dev = obj->dev; int ret; - UVMHIST_FUNC("udv_fault"); UVMHIST_CALLED(maphist); - UVMHIST_LOG(maphist," flags=%ld", flags,0,0,0); /* * we do not allow device mappings to be mapped copy-on-write @@ -1307,8 +1305,6 @@ drm_fault(struct uvm_faultinfo *ufi, vaddr_t vaddr, vm_page_t *pps, */ if (UVM_ET_ISCOPYONWRITE(entry)) { - UVMHIST_LOG(maphist, "<- failed -- COW entry (etype=0x%lx)", - entry->etype, 0,0,0); uvmfault_unlockall(ufi, ufi->entry->aref.ar_amap, uobj, NULL); return(VM_PAGER_ERROR); } diff --git a/sys/dev/pci/drm/i915_drv.c b/sys/dev/pci/drm/i915_drv.c index 6b579639ac1..a073e033ca9 100644 --- a/sys/dev/pci/drm/i915_drv.c +++ b/sys/dev/pci/drm/i915_drv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i915_drv.c,v 1.111 2011/06/06 17:10:23 ariane Exp $ */ +/* $OpenBSD: i915_drv.c,v 1.112 2011/07/03 18:34:14 oga Exp $ */ /* * Copyright (c) 2008-2009 Owain G. Ainsworth <oga@openbsd.org> * @@ -2545,9 +2545,6 @@ inteldrm_fault(struct drm_obj *obj, struct uvm_faultinfo *ufi, off_t offset, paddr = dev->agp->base + obj_priv->gtt_offset + offset; - UVMHIST_LOG(maphist, - " MAPPING: device: pm=%p, va=0x%lx, pa=0x%lx, at=%ld", - ufi->orig_map->pmap, vaddr, (u_long)paddr, mapprot); if (pmap_enter(ufi->orig_map->pmap, vaddr, paddr, mapprot, PMAP_CANFAIL | mapprot) != 0) { drm_unhold_object(obj); |