bitkeeper revision 1.1159.258.34 (422e593fP_MDJ47j5LhtS8fQOVuyAQ)

Update to NetBSD 2.0.1.
Signed-off-by: Christian Limpach <cl@NetBSD.org>

diff --git a/buildconfigs/Rules.mk b/buildconfigs/Rules.mk
index cdb6b096e2d75224820e191def7a6a8b1734c970..b0b0c4697fb2d6df16afc48e29efede4efa24e74 100644 (file)
--- a/buildconfigs/Rules.mk
+++ b/buildconfigs/Rules.mk
@@ -27,7 +27,7 @@ linux-%.tar.bz2:
 # Expand NetBSD release to NetBSD version
 NETBSD_RELEASE  ?= 2.0
 NETBSD_VER      ?= $(patsubst netbsd-%-xen-sparse,%,$(wildcard netbsd-$(NETBSD_RELEASE)*-xen-sparse))
-NETBSD_CVSSNAP  ?= 20041103
+NETBSD_CVSSNAP  ?= 20050309
 
 # Setup NetBSD search path
 NETBSD_SRC_PATH        ?= .:..

diff --git a/buildconfigs/mk.netbsd-2.0-xenU b/buildconfigs/mk.netbsd-2.0-xenU
index acd7e5801a028e5d2599f159f78a4bf5cef395d2..2e272aa6b396787ff981fdca3e1c2454da642851 100644 (file)
--- a/buildconfigs/mk.netbsd-2.0-xenU
+++ b/buildconfigs/mk.netbsd-2.0-xenU
@@ -1,6 +1,6 @@
 
 NETBSD_RELEASE   ?= 2.0
-NETBSD_CVSSNAP   ?= 20041103
+NETBSD_CVSSNAP   ?= 20050309
 
 EXTRAVERSION = xenU
 

diff --git a/netbsd-2.0-xen-sparse/sys/arch/xen/i386/locore.S b/netbsd-2.0-xen-sparse/sys/arch/xen/i386/locore.S
index ed0946cb9b2bcbe1f3229863f025307a39b1c38f..ba26df3a57fcb3da59f2ee75a28987faeffdfb89 100644 (file)
--- a/netbsd-2.0-xen-sparse/sys/arch/xen/i386/locore.S
+++ b/netbsd-2.0-xen-sparse/sys/arch/xen/i386/locore.S
@@ -249,6 +249,7 @@ _C_LABEL(biosextmem):       .long   REALEXTMEM
 
 #include <machine/xen.h>
 #define __HYPERVISOR_yield                8
+#define __SCHEDOP_yield                           0
 
        .space 512
 tmpstk:
@@ -1592,6 +1593,7 @@ idle_loop:
        jmp     idle_start
 4:
        movl    $__HYPERVISOR_yield,%eax
+       movl    $__SCHEDOP_yield,%ebx
        TRAP_INSTR
 NENTRY(mpidle)
 idle_start:    

diff --git a/netbsd-2.0-xen-sparse/sys/arch/xen/i386/machdep.c b/netbsd-2.0-xen-sparse/sys/arch/xen/i386/machdep.c
index 5ec2d45271c58a567742578a153f085de9fac6f7..801edd9dcb43a279b3db6dc4e7102856d0b363ed 100644 (file)
--- a/netbsd-2.0-xen-sparse/sys/arch/xen/i386/machdep.c
+++ b/netbsd-2.0-xen-sparse/sys/arch/xen/i386/machdep.c
@@ -854,6 +854,10 @@ haltsys:
        if (howto & RB_HALT) {
                printf("\n");
                printf("The operating system has halted.\n");
+
+               /* XXX cngetc() below doesn't work, shutdown machine for now */
+               HYPERVISOR_shutdown();
+
                printf("Please press any key to reboot.\n\n");
 
 #ifdef BEEP_ONHALT