svn commit: r295752 - in head: lib/libkvm sys/arm/include
Svatopluk Kraus
skra at FreeBSD.org
Thu Feb 18 09:30:06 UTC 2016
Author: skra
Date: Thu Feb 18 09:30:04 2016
New Revision: 295752
URL: https://svnweb.freebsd.org/changeset/base/295752
Log:
Remove redundant ARM_L2_ADDR_BITS and L2_ADDR_BITS definitions and
replace them by primary ones where needed.
Modified:
head/lib/libkvm/kvm_arm.c
head/lib/libkvm/kvm_arm.h
head/sys/arm/include/pmap.h
head/sys/arm/include/pte-v6.h
head/sys/arm/include/pte.h
Modified: head/lib/libkvm/kvm_arm.c
==============================================================================
--- head/lib/libkvm/kvm_arm.c Thu Feb 18 09:28:16 2016 (r295751)
+++ head/lib/libkvm/kvm_arm.c Thu Feb 18 09:30:04 2016 (r295752)
@@ -183,7 +183,7 @@ _arm_initvtop(kvm_t *kd)
#define l1pte_section_p(pde) (((pde) & ARM_L1_TYPE_MASK) == ARM_L1_TYPE_S)
#define l1pte_valid(pde) ((pde) != 0)
#define l2pte_valid(pte) ((pte) != 0)
-#define l2pte_index(v) (((v) & ARM_L2_ADDR_BITS) >> ARM_L2_S_SHIFT)
+#define l2pte_index(v) (((v) & ARM_L1_S_OFFSET) >> ARM_L2_S_SHIFT)
static int
Modified: head/lib/libkvm/kvm_arm.h
==============================================================================
--- head/lib/libkvm/kvm_arm.h Thu Feb 18 09:28:16 2016 (r295751)
+++ head/lib/libkvm/kvm_arm.h Thu Feb 18 09:30:04 2016 (r295752)
@@ -72,8 +72,6 @@ typedef uint32_t arm_pt_entry_t;
#define ARM_L2_TYPE_T 0x03 /* Tiny Page - 1k - not used */
#define ARM_L2_TYPE_MASK 0x03
-#define ARM_L2_ADDR_BITS 0x000ff000 /* L2 PTE address bits */
-
#ifdef __arm__
#include <machine/acle-compat.h>
@@ -106,7 +104,6 @@ _Static_assert(L2_TYPE_S == ARM_L2_TYPE_
_Static_assert(L2_TYPE_T == ARM_L2_TYPE_T, "L2_TYPE_T mismatch");
#endif
_Static_assert(L2_TYPE_MASK == ARM_L2_TYPE_MASK, "L2_TYPE_MASK mismatch");
-_Static_assert(L2_ADDR_BITS == ARM_L2_ADDR_BITS, "L2_ADDR_BITS mismatch");
#endif
int _arm_native(kvm_t *);
Modified: head/sys/arm/include/pmap.h
==============================================================================
--- head/sys/arm/include/pmap.h Thu Feb 18 09:28:16 2016 (r295751)
+++ head/sys/arm/include/pmap.h Thu Feb 18 09:30:04 2016 (r295752)
@@ -489,7 +489,7 @@ void pmap_use_minicache(vm_offset_t, vm_
#define l1pte_page_p(pde) (((pde) & L1_TYPE_MASK) == L1_TYPE_C)
#define l1pte_fpage_p(pde) (((pde) & L1_TYPE_MASK) == L1_TYPE_F)
-#define l2pte_index(v) (((v) & L2_ADDR_BITS) >> L2_S_SHIFT)
+#define l2pte_index(v) (((v) & L1_S_OFFSET) >> L2_S_SHIFT)
#define l2pte_valid(pte) ((pte) != 0)
#define l2pte_pa(pte) ((pte) & L2_S_FRAME)
#define l2pte_minidata(pte) (((pte) & \
Modified: head/sys/arm/include/pte-v6.h
==============================================================================
--- head/sys/arm/include/pte-v6.h Thu Feb 18 09:28:16 2016 (r295751)
+++ head/sys/arm/include/pte-v6.h Thu Feb 18 09:30:04 2016 (r295752)
@@ -296,11 +296,6 @@
*/
#define AP_KRW 0x01 /* kernel read/write */
-/*
- * lib/libkvm/kvm_arm.c
- */
-#define L2_ADDR_BITS 0x000ff000 /* L2 PTE address bits */
-
// -----------------------------------------------------------------------------
#endif /* !_MACHINE_PTE_H_ */
Modified: head/sys/arm/include/pte.h
==============================================================================
--- head/sys/arm/include/pte.h Thu Feb 18 09:28:16 2016 (r295751)
+++ head/sys/arm/include/pte.h Thu Feb 18 09:30:04 2016 (r295752)
@@ -148,8 +148,6 @@ typedef pt_entry_t pt2_entry_t; /* comp
* So, we allocate L2 tables 4 at a time, thus yielding a 4K L2
* table.
*/
-#define L2_ADDR_BITS 0x000ff000 /* L2 PTE address bits */
-
#define L1_TABLE_SIZE 0x4000 /* 16K */
#define L2_TABLE_SIZE 0x1000 /* 4K */
/*
More information about the svn-src-all
mailing list