From fad7eeb196426e187e33dcc412cb553f1c6ecac7 Mon Sep 17 00:00:00 2001 From: Andrew Turner Date: Thu, 11 Sep 2014 10:53:57 +0000 Subject: [PATCH] Rename pmap_kenter_temp to pmap_kenter_temporary to be consistent with the other architectures with this function. Submitted by: Svatopluk Kraus Submitted by: Michal Meloun --- sys/arm/arm/minidump_machdep.c | 4 ++-- sys/arm/arm/pmap-v6.c | 2 +- sys/arm/arm/pmap.c | 2 +- sys/arm/include/pmap.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/arm/arm/minidump_machdep.c b/sys/arm/arm/minidump_machdep.c index 85ea2827c25c..13f32428b65d 100644 --- a/sys/arm/arm/minidump_machdep.c +++ b/sys/arm/arm/minidump_machdep.c @@ -154,7 +154,7 @@ blk_write(struct dumperinfo *di, char *ptr, vm_paddr_t pa, size_t sz) 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++) { diff --git a/sys/arm/arm/pmap-v6.c b/sys/arm/arm/pmap-v6.c index 1be98885ec73..c0d5a2ebf629 100644 --- a/sys/arm/arm/pmap-v6.c +++ b/sys/arm/arm/pmap-v6.c @@ -2369,7 +2369,7 @@ pmap_kenter_section(vm_offset_t va, vm_offset_t pa, int flags) * 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; diff --git a/sys/arm/arm/pmap.c b/sys/arm/arm/pmap.c index ec0d236fa978..61afb4d72106 100644 --- a/sys/arm/arm/pmap.c +++ b/sys/arm/arm/pmap.c @@ -2663,7 +2663,7 @@ pmap_kenter_section(vm_offset_t va, vm_offset_t pa, int flags) * 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; diff --git a/sys/arm/include/pmap.h b/sys/arm/include/pmap.h index 70c337a9dfe7..3f0b9e984d77 100644 --- a/sys/arm/include/pmap.h +++ b/sys/arm/include/pmap.h @@ -256,7 +256,7 @@ int pmap_change_attr(vm_offset_t, vm_size_t, int); 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);