From 79c51e9805aae8b92a8806662a582fcab79ce30f Mon Sep 17 00:00:00 2001 From: skra Date: Thu, 18 Feb 2016 09:26:58 +0000 Subject: Remove unneeded definitions after r291406. Also remove redundant and not used L1_ADDR_BITS definition. --- sys/arm/include/pte-v6.h | 22 ---------------------- sys/arm/include/pte.h | 2 -- 2 files changed, 24 deletions(-) (limited to 'sys/arm') diff --git a/sys/arm/include/pte-v6.h b/sys/arm/include/pte-v6.h index c0eb417..67484cc 100644 --- a/sys/arm/include/pte-v6.h +++ b/sys/arm/include/pte-v6.h @@ -299,30 +299,8 @@ /* * lib/libkvm/kvm_arm.c */ -#define L1_ADDR_MASK 0xfffffc00 - -/* - * lib/libkvm/kvm_arm.c - */ #define L2_ADDR_BITS 0x000ff000 /* L2 PTE address bits */ -#ifndef LOCORE -/* - * sys/arm/arm/minidump_machdep.c - * sys/arm/arm/pmap.c - * sys/arm/arm/pmap.h (hack for our hack in pmap.h ) - * lib/libkvm/kvm_arm.c - */ -typedef uint32_t pd_entry_t; /* page directory entry */ - -/* - * sys/arm/arm/minidump_machdep.c - * sys/arm/arm/pmap.c - * sys/arm/arm/pmap.h (hack for our hack in pmap.h ) - * sys/arm/include/param.h - */ -typedef uint32_t pt_entry_t; /* page table entry */ -#endif // ----------------------------------------------------------------------------- #endif /* !_MACHINE_PTE_H_ */ diff --git a/sys/arm/include/pte.h b/sys/arm/include/pte.h index 8c26aab..e65242b 100644 --- a/sys/arm/include/pte.h +++ b/sys/arm/include/pte.h @@ -73,7 +73,6 @@ typedef pt_entry_t pt2_entry_t; /* compatibility with v6 */ #define L2_INVAL 0x00 /* L2 invalid type */ /* L1 and L2 address masks */ -#define L1_ADDR_MASK 0xfffffc00 #define L2_ADDR_MASK 0xfffff000 /* @@ -152,7 +151,6 @@ typedef pt_entry_t pt2_entry_t; /* compatibility with v6 */ * So, we allocate L2 tables 4 at a time, thus yielding a 4K L2 * table. */ -#define L1_ADDR_BITS 0xfff00000 /* L1 PTE address bits */ #define L2_ADDR_BITS 0x000ff000 /* L2 PTE address bits */ #define L1_TABLE_SIZE 0x4000 /* 16K */ -- cgit v1.1