Author: alc
Date: Mon Jun 22 04:21:02 2009
New Revision: 194611
URL: http://svn.freebsd.org/changeset/base/194611
Log:
Eliminate dead code. These definitions should have been deleted with the
introduction of i686_mem.c in r45405.
Merge adjacent #ifdef _KERNEL/#endif blocks.
Modified:
head/sys/amd64/include/pmap.h
head/sys/i386/include/pmap.h
Modified: head/sys/amd64/include/pmap.h
==============================================================================
--- head/sys/amd64/include/pmap.h Sun Jun 21 21:42:29 2009
(r194610)
+++ head/sys/amd64/include/pmap.h Mon Jun 22 04:21:02 2009
(r194611)
@@ -175,9 +175,7 @@ typedef u_int64_t pml4_entry_t;
#define PML4pml4e ((pd_entry_t *)(addr_PML4pml4e))
extern u_int64_t KPML4phys; /* physical address of kernel level 4 */
-#endif
-#ifdef _KERNEL
/*
* virtual address to page table entry and
* to physical address.
@@ -294,14 +292,6 @@ struct pv_chunk {
#ifdef _KERNEL
-#define NPPROVMTRR 8
-#define PPRO_VMTRRphysBase0 0x200
-#define PPRO_VMTRRphysMask0 0x201
-struct ppro_vmtrr {
- u_int64_t base, mask;
-};
-extern struct ppro_vmtrr PPro_vmtrr[NPPROVMTRR];
-
extern caddr_t CADDR1;
extern pt_entry_t *CMAP1;
extern vm_paddr_t phys_avail[];
Modified: head/sys/i386/include/pmap.h
==============================================================================
--- head/sys/i386/include/pmap.h Sun Jun 21 21:42:29 2009
(r194610)
+++ head/sys/i386/include/pmap.h Mon Jun 22 04:21:02 2009
(r194611)
@@ -185,9 +185,7 @@ extern pd_entry_t PTDpde[];
extern pdpt_entry_t *IdlePDPT;
#endif
extern pd_entry_t *IdlePTD; /* physical address of "Idle" state directory */
-#endif
-#ifdef _KERNEL
/*
* virtual address to page table entry and
* to physical address.
@@ -450,14 +448,6 @@ struct pv_chunk {
#ifdef _KERNEL
-#define NPPROVMTRR 8
-#define PPRO_VMTRRphysBase0 0x200
-#define PPRO_VMTRRphysMask0 0x201
-struct ppro_vmtrr {
- u_int64_t base, mask;
-};
-extern struct ppro_vmtrr PPro_vmtrr[NPPROVMTRR];
-
extern caddr_t CADDR1;
extern pt_entry_t *CMAP1;
extern vm_paddr_t phys_avail[];
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
