From owner-p4-projects@FreeBSD.ORG  Fri May 24 09:33:16 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id E663C8CB; Fri, 24 May 2013 09:33:15 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id A78EC8C9
 for <perforce@freebsd.org>; Fri, 24 May 2013 09:33:15 +0000 (UTC)
 (envelope-from prw35@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 98B38E13
 for <perforce@freebsd.org>; Fri, 24 May 2013 09:33:15 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r4O9XFL4045143
 for <perforce@freebsd.org>; Fri, 24 May 2013 09:33:15 GMT
 (envelope-from prw35@FreeBSD.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r4O9XFnr045140
 for perforce@freebsd.org; Fri, 24 May 2013 09:33:15 GMT
 (envelope-from prw35@FreeBSD.org)
Date: Fri, 24 May 2013 09:33:15 GMT
Message-Id: <201305240933.r4O9XFnr045140@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 prw35@FreeBSD.org using -f
From: Philip Withnall <prw35@FreeBSD.org>
Subject: PERFORCE change 228998 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 24 May 2013 09:33:16 -0000

http://p4web.freebsd.org/@@228998?ac=10

Change 228998 by prw35@pwithnall_zenith on 2013/05/24 09:32:34

	Remove a failing check from the CHERI compositor driver
	
	Recent changes to the VM code in FreeBSD seem to have caused this check
	to start failing, which I didn't notice when merging before. The check
	wasn't really necessary, so just drop it.

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/sys/dev/cheri/compositor/cheri_compositor_cfb.c#3 edit

Differences ...

==== //depot/projects/ctsrd/cheribsd/src/sys/dev/cheri/compositor/cheri_compositor_cfb.c#3 (text+ko) ====

@@ -139,7 +139,7 @@
 {
 	vm_pindex_t pidx;
 	vm_paddr_t paddr;
-	vm_page_t m_paddr, page;
+	vm_page_t page;
 	struct cfb_vm_object *cfb_vm_obj;
 	struct cdev *dev;
 	struct cheri_compositor_softc *sc;
@@ -186,10 +186,6 @@
 	dev_relthread(dev, ref);
 
 	/* Sanity checks. */
-	m_paddr = vm_phys_paddr_to_vm_page(paddr);
-	KASSERT((m_paddr == NULL ||
-	    pmap_page_get_memattr(m_paddr) == VM_MEMATTR_UNCACHEABLE),
-	    ("Expected uncacheable page."));
 	KASSERT((((*mres)->flags & PG_FICTITIOUS) == 0),
 	    ("Expected non-fictitious page."));