Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 17 Aug 2015 18:28:41 +0000 (UTC)
From:      "Jason A. Harmening" <jah@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r286851 - head/sys/arm/arm
Message-ID:  <201508171828.t7HISfC2068520@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: jah
Date: Mon Aug 17 18:28:40 2015
New Revision: 286851
URL: https://svnweb.freebsd.org/changeset/base/286851

Log:
  Some cleanups to make the style of pmap_quick_enter_page() and pmap_quick_remove_page() in arm/pmap-v6-new.c more consistent with the rest of the file.
  
  Submitted by:	Svatopluk Kraus <onwahe@gmail.com>
  Approved by:	kib (mentor)

Modified:
  head/sys/arm/arm/pmap-v6-new.c

Modified: head/sys/arm/arm/pmap-v6-new.c
==============================================================================
--- head/sys/arm/arm/pmap-v6-new.c	Mon Aug 17 18:21:18 2015	(r286850)
+++ head/sys/arm/arm/pmap-v6-new.c	Mon Aug 17 18:28:40 2015	(r286851)
@@ -1166,10 +1166,9 @@ pmap_init_qpages(void)
 		pc = pcpu_find(i);
 		pc->pc_qmap_addr = kva_alloc(PAGE_SIZE);
 		if (pc->pc_qmap_addr == 0)
-			panic("pmap_init_qpages: unable to allocate KVA");
+			panic("%s: unable to allocate KVA", __func__);
 	}
 }
-
 SYSINIT(qpages_init, SI_SUB_CPU, SI_ORDER_ANY, pmap_init_qpages, NULL);
 
 /*
@@ -5728,18 +5727,17 @@ pmap_copy_pages(vm_page_t ma[], vm_offse
 vm_offset_t
 pmap_quick_enter_page(vm_page_t m)
 {
-	pt2_entry_t *pte;
-	vm_offset_t qmap_addr; 
+	pt2_entry_t *pte2p;
+	vm_offset_t qmap_addr;
 
 	critical_enter();
-
 	qmap_addr = PCPU_GET(qmap_addr);
-	pte = pt2map_entry(qmap_addr);
+	pte2p = pt2map_entry(qmap_addr);
 
-	KASSERT(*pte == 0, ("pmap_quick_enter_page: PTE busy"));
+	KASSERT(pte2_load(pte2p) == 0, ("%s: PTE2 busy", __func__));
 
-	pte2_store(pte, PTE2_KERN_NG(VM_PAGE_TO_PHYS(m),
-	    PTE2_AP_KRW, pmap_page_get_memattr(m)));
+	pte2_store(pte2p, PTE2_KERN_NG(VM_PAGE_TO_PHYS(m), PTE2_AP_KRW,
+	    pmap_page_get_memattr(m)));
 	tlb_flush_local(qmap_addr);
 
 	return (qmap_addr);
@@ -5748,16 +5746,16 @@ pmap_quick_enter_page(vm_page_t m)
 void
 pmap_quick_remove_page(vm_offset_t addr)
 {
-	pt2_entry_t *pte;
+	pt2_entry_t *pte2p;
 	vm_offset_t qmap_addr;
 
 	qmap_addr = PCPU_GET(qmap_addr);
-	pte = pt2map_entry(qmap_addr);
+	pte2p = pt2map_entry(qmap_addr);
 
-	KASSERT(addr == qmap_addr, ("pmap_quick_remove_page: invalid address"));
-	KASSERT(*pte != 0, ("pmap_quick_remove_page: PTE not in use"));
+	KASSERT(addr == qmap_addr, ("%s: invalid address", __func__));
+	KASSERT(pte2_load(pte2p) != 0, ("%s: PTE2 not in use", __func__));
 
-	pte2_clear(pte);
+	pte2_clear(pte2p);
 	critical_exit();
 }

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508171828.t7HISfC2068520>