s/MAX_PID/HPPA_MAX_PID/g

2 files changed, 33 insertions, 8 deletions

diff --git a/sys/arch/hppa/hppa/pmap.c b/sys/arch/hppa/hppa/pmap.c
index 8d139a4dc2f..af9bd6e2f68 100644
--- a/sys/arch/hppa/hppa/pmap.c
+++ b/sys/arch/hppa/hppa/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.11 1999/01/20 19:29:50 mickey Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.12 1999/01/20 19:39:51 mickey Exp $	*/
 
 /*
  * Copyright (c) 1998 Michael Shalayeff
@@ -902,7 +902,7 @@ pmap_pinit(pmap)
 		 * If all are allocated, there is nothing we can do.
 		 */
 		simple_lock(&sid_pid_lock);
-		if (pid_counter <= MAX_PID) {
+		if (pid_counter <= HPPA_MAX_PID) {
 			pid = pid_counter;
 			pid_counter += 2;
 		} else
diff --git a/sys/arch/hppa/include/pmap.h b/sys/arch/hppa/include/pmap.h
index 872917dfad3..ef032f5deec 100644
--- a/sys/arch/hppa/include/pmap.h
+++ b/sys/arch/hppa/include/pmap.h
@@ -1,6 +1,35 @@
-/* $OpenBSD: pmap.h,v 1.6 1999/01/20 19:29:51 mickey Exp $ */
+/*	$OpenBSD: pmap.h,v 1.7 1999/01/20 19:39:53 mickey Exp $	*/
 
 /*
+ * Copyright (c) 1998 Michael Shalayeff
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by Michael Shalayeff.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/*
  * Copyright 1996 1995 by Open Software Foundation, Inc.   
  *              All Rights Reserved 
  *  
@@ -53,10 +82,6 @@
 
 #include <machine/pte.h>
 
-#define EQUIV_HACK	/* no multiple mapping of kernel equiv space allowed */
-
-#define BTLB		/* Use block TLBs: PA 1.1 and above */
-
 /*
  * This hash function is the one used by the hardware TLB walker on the 7100.
  */
@@ -123,7 +148,7 @@ struct pmap_physseg {
 	struct pv_entry *pvent;
 };
 
-#define MAX_PID		0xfffa
+#define HPPA_MAX_PID	0xfffa
 #define	HPPA_SID_KERNEL	0
 #define	HPPA_PID_KERNEL	2