svn commit: r295750 - head/sys/arm/include

[Svatopluk Kraus]

Author: skra
Date: Thu Feb 18 09:26:58 2016
New Revision: 295750
URL: https://svnweb.freebsd.org/changeset/base/295750

Log:
  Remove unneeded definitions after r291406. Also remove redundant and
  not used L1_ADDR_BITS definition.

Modified:
  head/sys/arm/include/pte-v6.h
  head/sys/arm/include/pte.h

Modified: head/sys/arm/include/pte-v6.h
==============================================================================
--- head/sys/arm/include/pte-v6.h	Thu Feb 18 08:44:16 2016	(r295749)
+++ head/sys/arm/include/pte-v6.h	Thu Feb 18 09:26:58 2016	(r295750)
@@ -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_ */

Modified: head/sys/arm/include/pte.h
==============================================================================
--- head/sys/arm/include/pte.h	Thu Feb 18 08:44:16 2016	(r295749)
+++ head/sys/arm/include/pte.h	Thu Feb 18 09:26:58 2016	(r295750)
@@ -73,7 +73,6 @@ typedef	pt_entry_t	pt2_entry_t;		/* comp
 #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;		/* comp
  * 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 */