[src/sommerfeld_i386mp_1]: src/sys/arch/i386 Merge up with -current

[sommerfeld <sommerfeld%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7e75a4bec4fd
branches:  sommerfeld_i386mp_1
changeset: 482403:7e75a4bec4fd
user:      sommerfeld <sommerfeld%NetBSD.org@localhost>
date:      Sat May 26 20:05:42 2001 +0000

description:
Merge up with -current

diffstat:

 sys/arch/i386/i386/genassym.cf |  6 +++++-
 sys/arch/i386/i386/pmap.c      |  6 +++---
 sys/arch/i386/include/pmap.h   |  4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diffs (65 lines):

diff -r 53aae4255a5d -r 7e75a4bec4fd sys/arch/i386/i386/genassym.cf
--- a/sys/arch/i386/i386/genassym.cf    Sat May 26 17:46:13 2001 +0000
+++ b/sys/arch/i386/i386/genassym.cf    Sat May 26 20:05:42 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: genassym.cf,v 1.17.10.11 2001/04/30 16:23:10 sommerfeld Exp $
+#      $NetBSD: genassym.cf,v 1.17.10.12 2001/05/26 20:05:42 sommerfeld Exp $
 
 #
 # Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -90,6 +90,7 @@
 include <netinet/in.h>
 include <netinet/in_systm.h>
 include <netinet/ip.h>
+include <netinet/ip6.h>
 include <netinet/ip_var.h>
 
 include <uvm/uvm.h>
@@ -164,6 +165,9 @@
 define IP_SRC                  offsetof(struct ip, ip_src)
 define IP_DST                  offsetof(struct ip, ip_dst)
 
+define IP6_SRC                 offsetof(struct ip6_hdr, ip6_src)
+define IP6_DST                 offsetof(struct ip6_hdr, ip6_dst)
+
 define V_TRAP                  offsetof(struct uvmexp, traps)
 define V_INTR                  offsetof(struct uvmexp, intrs)
 
diff -r 53aae4255a5d -r 7e75a4bec4fd sys/arch/i386/i386/pmap.c
--- a/sys/arch/i386/i386/pmap.c Sat May 26 17:46:13 2001 +0000
+++ b/sys/arch/i386/i386/pmap.c Sat May 26 20:05:42 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.83.2.39 2001/05/23 04:37:25 sommerfeld Exp $        */
+/*     $NetBSD: pmap.c,v 1.83.2.40 2001/05/26 20:05:42 sommerfeld Exp $        */
 
 /*
  *
@@ -229,8 +229,8 @@
  * locking data structures
  */
 
-static simple_lock_data_t pvalloc_lock;
-static simple_lock_data_t pmaps_lock;
+static struct simplelock pvalloc_lock;
+static struct simplelock pmaps_lock;
 
 #if defined(MULTIPROCESSOR) || defined(LOCKDEBUG)
 static struct lock pmap_main_lock;
diff -r 53aae4255a5d -r 7e75a4bec4fd sys/arch/i386/include/pmap.h
--- a/sys/arch/i386/include/pmap.h      Sat May 26 17:46:13 2001 +0000
+++ b/sys/arch/i386/include/pmap.h      Sat May 26 20:05:42 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.h,v 1.43.2.11 2001/04/30 16:23:13 sommerfeld Exp $        */
+/*     $NetBSD: pmap.h,v 1.43.2.12 2001/05/26 20:05:43 sommerfeld Exp $        */
 
 /*
  *
@@ -280,7 +280,7 @@
 struct pv_entry;
 
 struct pv_head {
-       simple_lock_data_t pvh_lock;    /* locks every pv on this list */
+       struct simplelock pvh_lock;     /* locks every pv on this list */
        struct pv_entry *pvh_list;      /* head of list (locked by pvh_lock) */
 };