From owner-p4-projects@FreeBSD.ORG Wed Aug 22 00:59:09 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5090816A421; Wed, 22 Aug 2007 00:59:09 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 25B9516A417 for ; Wed, 22 Aug 2007 00:59:09 +0000 (UTC) (envelope-from jbr@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 16C0D13C494 for ; Wed, 22 Aug 2007 00:59:09 +0000 (UTC) (envelope-from jbr@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l7M0x8I3020714 for ; Wed, 22 Aug 2007 00:59:08 GMT (envelope-from jbr@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l7M0x8nA020709 for perforce@freebsd.org; Wed, 22 Aug 2007 00:59:08 GMT (envelope-from jbr@FreeBSD.org) Date: Wed, 22 Aug 2007 00:59:08 GMT Message-Id: <200708220059.l7M0x8nA020709@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jbr@FreeBSD.org using -f From: Jesper Brix Rosenkilde To: Perforce Change Reviews Cc: Subject: PERFORCE change 125522 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Aug 2007 00:59:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=125522 Change 125522 by jbr@jbr_bob on 2007/08/22 00:58:29 sync Affected files ... .. //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/dev/drm/i915_dma.c#3 integrate .. //depot/projects/soc2007/jbr-syscall/src/sys/i386/i386/pmap.c#2 integrate Differences ... ==== //depot/projects/soc2007/jbr-syscall/src/sys/amd64/amd64/pmap.c#2 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.589 2007/07/01 07:08:25 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.590 2007/08/21 04:59:33 alc Exp $"); /* * Manages physical address maps. @@ -1722,7 +1722,7 @@ static const struct timeval printinterval = { 60, 0 }; static struct timeval lastprint; static vm_pindex_t colour; - int bit, field, page_req; + int bit, field; pv_entry_t pv; struct pv_chunk *pc; vm_page_t m; @@ -1755,8 +1755,7 @@ } } /* No free items, allocate another chunk */ - page_req = try ? VM_ALLOC_NORMAL : VM_ALLOC_SYSTEM; - m = vm_page_alloc(NULL, colour, page_req | VM_ALLOC_NOOBJ); + m = vm_page_alloc(NULL, colour, VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ); if (m == NULL) { if (try) { pv_entry_count--; @@ -1775,7 +1774,7 @@ PV_STAT(pmap_collect_inactive++); pmap_collect(pmap, &vm_page_queues[PQ_INACTIVE]); m = vm_page_alloc(NULL, colour, - VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ); + VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ); if (m == NULL) { PV_STAT(pmap_collect_active++); pmap_collect(pmap, &vm_page_queues[PQ_ACTIVE]); ==== //depot/projects/soc2007/jbr-syscall/src/sys/dev/drm/i915_dma.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/drm/i915_dma.c,v 1.5 2007/07/12 09:02:31 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/i915_dma.c,v 1.6 2007/08/21 12:52:57 kib Exp $"); #include "dev/drm/drmP.h" #include "dev/drm/drm.h" @@ -125,18 +125,17 @@ drm_dma_handle_t *dmah; DRM_UNLOCK(); + memset(dev_priv, 0, sizeof(drm_i915_private_t)); dmah = drm_pci_alloc(dev, PAGE_SIZE, PAGE_SIZE, 0xffffffff); + DRM_LOCK(); if (!dmah) { dev->dev_private = (void *)dev_priv; i915_dma_cleanup(dev); DRM_ERROR("Can not allocate hardware status page\n"); - DRM_LOCK(); return DRM_ERR(ENOMEM); } - DRM_LOCK(); - memset(dev_priv, 0, sizeof(drm_i915_private_t)); dev_priv->status_page_dmah = dmah; DRM_GETSAREA(); ==== //depot/projects/soc2007/jbr-syscall/src/sys/i386/i386/pmap.c#2 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.593 2007/07/01 07:08:26 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.594 2007/08/21 04:59:34 alc Exp $"); /* * Manages physical address maps. @@ -1795,7 +1795,7 @@ static const struct timeval printinterval = { 60, 0 }; static struct timeval lastprint; static vm_pindex_t colour; - int bit, field, page_req; + int bit, field; pv_entry_t pv; struct pv_chunk *pc; vm_page_t m; @@ -1830,8 +1830,7 @@ } } pc = (struct pv_chunk *)pmap_ptelist_alloc(&pv_vafree); - page_req = try ? VM_ALLOC_NORMAL : VM_ALLOC_SYSTEM; - m = vm_page_alloc(NULL, colour, page_req | + m = vm_page_alloc(NULL, colour, VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ | VM_ALLOC_WIRED); if (m == NULL || pc == NULL) { if (try) { @@ -1860,7 +1859,7 @@ PV_STAT(pmap_collect_inactive++); pmap_collect(pmap, &vm_page_queues[PQ_INACTIVE]); if (m == NULL) - m = vm_page_alloc(NULL, colour, VM_ALLOC_SYSTEM | + m = vm_page_alloc(NULL, colour, VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ | VM_ALLOC_WIRED); if (pc == NULL) pc = (struct pv_chunk *)pmap_ptelist_alloc(&pv_vafree);