ia64/xen-unstable

changeset 4032:7a898f4725b2

bitkeeper revision 1.1159.258.34 (422e593fP_MDJ47j5LhtS8fQOVuyAQ)

Update to NetBSD 2.0.1.
Signed-off-by: Christian Limpach <cl@NetBSD.org>
author cl349@firebug.cl.cam.ac.uk
date Wed Mar 09 02:02:39 2005 +0000 (2005-03-09)
parents 696112ffefa8
children 77fbd1da5611 94b7d61e3dfe 8a0070a6f1b6 38b5ede19a45
files buildconfigs/Rules.mk buildconfigs/mk.netbsd-2.0-xenU netbsd-2.0-xen-sparse/sys/arch/xen/i386/locore.S netbsd-2.0-xen-sparse/sys/arch/xen/i386/machdep.c
line diff
     1.1 --- a/buildconfigs/Rules.mk	Wed Mar 09 01:06:53 2005 +0000
     1.2 +++ b/buildconfigs/Rules.mk	Wed Mar 09 02:02:39 2005 +0000
     1.3 @@ -27,7 +27,7 @@ linux-%.tar.bz2:
     1.4  # Expand NetBSD release to NetBSD version
     1.5  NETBSD_RELEASE  ?= 2.0
     1.6  NETBSD_VER      ?= $(patsubst netbsd-%-xen-sparse,%,$(wildcard netbsd-$(NETBSD_RELEASE)*-xen-sparse))
     1.7 -NETBSD_CVSSNAP  ?= 20041103
     1.8 +NETBSD_CVSSNAP  ?= 20050309
     1.9  
    1.10  # Setup NetBSD search path
    1.11  NETBSD_SRC_PATH	?= .:..
     2.1 --- a/buildconfigs/mk.netbsd-2.0-xenU	Wed Mar 09 01:06:53 2005 +0000
     2.2 +++ b/buildconfigs/mk.netbsd-2.0-xenU	Wed Mar 09 02:02:39 2005 +0000
     2.3 @@ -1,6 +1,6 @@
     2.4  
     2.5  NETBSD_RELEASE   ?= 2.0
     2.6 -NETBSD_CVSSNAP   ?= 20041103
     2.7 +NETBSD_CVSSNAP   ?= 20050309
     2.8  
     2.9  EXTRAVERSION = xenU
    2.10  
     3.1 --- a/netbsd-2.0-xen-sparse/sys/arch/xen/i386/locore.S	Wed Mar 09 01:06:53 2005 +0000
     3.2 +++ b/netbsd-2.0-xen-sparse/sys/arch/xen/i386/locore.S	Wed Mar 09 02:02:39 2005 +0000
     3.3 @@ -249,6 +249,7 @@
     3.4  
     3.5  #include <machine/xen.h>
     3.6  #define __HYPERVISOR_yield		   8
     3.7 +#define __SCHEDOP_yield			   0
     3.8  
     3.9  	.space 512
    3.10  tmpstk:
    3.11 @@ -1592,6 +1593,7 @@ idle_loop:
    3.12  	jmp	idle_start
    3.13  4:
    3.14  	movl	$__HYPERVISOR_yield,%eax
    3.15 +	movl	$__SCHEDOP_yield,%ebx
    3.16  	TRAP_INSTR
    3.17  NENTRY(mpidle)
    3.18  idle_start:	
     4.1 --- a/netbsd-2.0-xen-sparse/sys/arch/xen/i386/machdep.c	Wed Mar 09 01:06:53 2005 +0000
     4.2 +++ b/netbsd-2.0-xen-sparse/sys/arch/xen/i386/machdep.c	Wed Mar 09 02:02:39 2005 +0000
     4.3 @@ -854,6 +854,10 @@ haltsys:
     4.4  	if (howto & RB_HALT) {
     4.5  		printf("\n");
     4.6  		printf("The operating system has halted.\n");
     4.7 +
     4.8 +		/* XXX cngetc() below doesn't work, shutdown machine for now */
     4.9 +		HYPERVISOR_shutdown();
    4.10 +
    4.11  		printf("Please press any key to reboot.\n\n");
    4.12  
    4.13  #ifdef BEEP_ONHALT