PERFORCE change 228998 for review

[Philip Withnall]

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

Change 228998 by prw35 at 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."));