Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 11 Sep 2014 10:53:57 +0000 (UTC)
From:      Andrew Turner <andrew@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r271422 - in head/sys/arm: arm include
Message-ID:  <201409111053.s8BArvDc060308@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: andrew
Date: Thu Sep 11 10:53:57 2014
New Revision: 271422
URL: http://svnweb.freebsd.org/changeset/base/271422

Log:
  Rename pmap_kenter_temp to pmap_kenter_temporary to be consistent with the
  other architectures with this function.
  
  Submitted by:	Svatopluk Kraus <onwahe at gmail.com>
  Submitted by:	Michal Meloun <meloun at miracle.cz>

Modified:
  head/sys/arm/arm/minidump_machdep.c
  head/sys/arm/arm/pmap-v6.c
  head/sys/arm/arm/pmap.c
  head/sys/arm/include/pmap.h

Modified: head/sys/arm/arm/minidump_machdep.c
==============================================================================
--- head/sys/arm/arm/minidump_machdep.c	Thu Sep 11 10:27:59 2014	(r271421)
+++ head/sys/arm/arm/minidump_machdep.c	Thu Sep 11 10:53:57 2014	(r271422)
@@ -154,7 +154,7 @@ blk_write(struct dumperinfo *di, char *p
 			sz -= len;
 		} else {
 			for (i = 0; i < len; i += PAGE_SIZE)
-				dump_va = pmap_kenter_temp(pa + i,
+				dump_va = pmap_kenter_temporary(pa + i,
 				    (i + fragsz) >> PAGE_SHIFT);
 			fragsz += len;
 			pa += len;
@@ -244,7 +244,7 @@ minidumpsys(struct dumperinfo *di)
 		}
 		if (pmap_pde_v(pdp) && pmap_pde_page(pdp)) {
 			/* Set bit for each valid page in this 1MB block */
-			addr = pmap_kenter_temp(*pdp & L1_C_ADDR_MASK, 0);
+			addr = pmap_kenter_temporary(*pdp & L1_C_ADDR_MASK, 0);
 			pt = (pt_entry_t*)(addr +
 			    (((uint32_t)*pdp  & L1_C_ADDR_MASK) & PAGE_MASK));
 			for (k = 0; k < 256; k++) {

Modified: head/sys/arm/arm/pmap-v6.c
==============================================================================
--- head/sys/arm/arm/pmap-v6.c	Thu Sep 11 10:27:59 2014	(r271421)
+++ head/sys/arm/arm/pmap-v6.c	Thu Sep 11 10:53:57 2014	(r271422)
@@ -2369,7 +2369,7 @@ pmap_kenter_section(vm_offset_t va, vm_o
  * to be used for panic dumps.
  */
 void *
-pmap_kenter_temp(vm_paddr_t pa, int i)
+pmap_kenter_temporary(vm_paddr_t pa, int i)
 {
 	vm_offset_t va;
 

Modified: head/sys/arm/arm/pmap.c
==============================================================================
--- head/sys/arm/arm/pmap.c	Thu Sep 11 10:27:59 2014	(r271421)
+++ head/sys/arm/arm/pmap.c	Thu Sep 11 10:53:57 2014	(r271422)
@@ -2663,7 +2663,7 @@ pmap_kenter_section(vm_offset_t va, vm_o
  * to be used for panic dumps.
  */
 void *
-pmap_kenter_temp(vm_paddr_t pa, int i)
+pmap_kenter_temporary(vm_paddr_t pa, int i)
 {
 	vm_offset_t va;
 

Modified: head/sys/arm/include/pmap.h
==============================================================================
--- head/sys/arm/include/pmap.h	Thu Sep 11 10:27:59 2014	(r271421)
+++ head/sys/arm/include/pmap.h	Thu Sep 11 10:53:57 2014	(r271422)
@@ -256,7 +256,7 @@ int	pmap_change_attr(vm_offset_t, vm_siz
 void	pmap_kenter(vm_offset_t va, vm_paddr_t pa);
 void	pmap_kenter_nocache(vm_offset_t va, vm_paddr_t pa);
 void	pmap_kenter_device(vm_offset_t va, vm_paddr_t pa);
-void	*pmap_kenter_temp(vm_paddr_t pa, int i);
+void	*pmap_kenter_temporary(vm_paddr_t pa, int i);
 void 	pmap_kenter_user(vm_offset_t va, vm_paddr_t pa);
 vm_paddr_t pmap_kextract(vm_offset_t va);
 void	pmap_kremove(vm_offset_t);



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