diff options
| author | skra <skra@FreeBSD.org> | 2016-02-18 09:30:04 +0000 |
|---|---|---|
| committer | skra <skra@FreeBSD.org> | 2016-02-18 09:30:04 +0000 |
| commit | aa894ca21be2b6aa296cc5cf4f11a58612b0f5c5 (patch) | |
| tree | d0b136fd017e6518e52064affe4b954004999915 /lib/libkvm | |
| parent | 347c41395e2a73bf4980182b13a701abe79643c0 (diff) | |
| download | FreeBSD-src-aa894ca21be2b6aa296cc5cf4f11a58612b0f5c5.zip FreeBSD-src-aa894ca21be2b6aa296cc5cf4f11a58612b0f5c5.tar.gz | |
Remove redundant ARM_L2_ADDR_BITS and L2_ADDR_BITS definitions and
replace them by primary ones where needed.
Diffstat (limited to 'lib/libkvm')
| -rw-r--r-- | lib/libkvm/kvm_arm.c | 2 | ||||
| -rw-r--r-- | lib/libkvm/kvm_arm.h | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/lib/libkvm/kvm_arm.c b/lib/libkvm/kvm_arm.c index bbead35..ae5fb5b 100644 --- a/lib/libkvm/kvm_arm.c +++ b/lib/libkvm/kvm_arm.c @@ -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 diff --git a/lib/libkvm/kvm_arm.h b/lib/libkvm/kvm_arm.h index 096a6b1..404d63a 100644 --- a/lib/libkvm/kvm_arm.h +++ b/lib/libkvm/kvm_arm.h @@ -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_S, "L2_TYPE_S mismatch"); _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 *); |
