Merge luna88k and mvme88k pmap. The pmap will now assume that the memory

below the kernel text is reserved for the PROM, instead of using fixed
(but different) values between luna88k and mvme88k.

Tested on mvme88k by myself, on luna88k by aoyama@

1 files changed, 3 insertions, 49 deletions

diff --git a/sys/arch/mvme88k/include/pmap_table.h b/sys/arch/mvme88k/include/pmap_table.h
index faab4e416ee..327226180d3 100644
--- a/sys/arch/mvme88k/include/pmap_table.h
+++ b/sys/arch/mvme88k/include/pmap_table.h
@@ -1,49 +1,3 @@
-/*	$OpenBSD: pmap_table.h,v 1.10 2003/10/05 20:27:46 miod Exp $ */
-/*
- * Mach Operating System
- * Copyright (c) 1992 Carnegie Mellon University
- * All Rights Reserved.
- *
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-
-#ifndef __MACHINE_PMAP_TABLE_H__
-#define __MACHINE_PMAP_TABLE_H__
-
-/*
- * Built-in mappings list.
- * An entry is considered invalid if pm_size = 0, and
- * end of list is indicated by pm_size 0xffffffff
- */
-typedef struct {
-	vaddr_t		phys_start;	/* in bytes */
-	vaddr_t		virt_start;	/* in bytes */
-	vsize_t		size;		/* in bytes */
-	unsigned int	prot;		/* vm_prot_read, vm_prot_write */
-	unsigned int	cacheability;	/* none, writeback, normal */
-} pmap_table_entry;
-
-typedef const pmap_table_entry *pmap_table_t;
-
-pmap_table_t pmap_table_build(void);
-
-#endif	/* __MACHINE_PMAP_TABLE_H__ */
-
+/* $OpenBSD: pmap_table.h,v 1.11 2004/07/25 11:06:42 miod Exp $ */
+/* public domain */
+#include <m88k/pmap_table.h>