diff options
author | cl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk> | 2005-03-09 02:07:37 +0000 |
---|---|---|
committer | cl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk> | 2005-03-09 02:07:37 +0000 |
commit | b21b609245b5a5fe676acdfa52a7ed5499f211d1 (patch) | |
tree | b01e0b018428a6d7c41eb24634adca210a599ebf /netbsd-2.0-xen-sparse | |
parent | a247c266ef2a6b87d4f33bf9b4009fcf9f3bf06b (diff) | |
parent | 06f98ccd3585ead4e6f71a73caef52e259f20aea (diff) | |
download | xen-b21b609245b5a5fe676acdfa52a7ed5499f211d1.tar.gz xen-b21b609245b5a5fe676acdfa52a7ed5499f211d1.tar.bz2 xen-b21b609245b5a5fe676acdfa52a7ed5499f211d1.zip |
bitkeeper revision 1.1236.12.15 (422e5a69zhiLV3Xbq3D-aL20QlyddA)
Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/netbsd/xen-unstable.bk
Diffstat (limited to 'netbsd-2.0-xen-sparse')
-rwxr-xr-x | netbsd-2.0-xen-sparse/mkbuildtree | 2 | ||||
-rw-r--r-- | netbsd-2.0-xen-sparse/sys/arch/xen/i386/locore.S | 2 | ||||
-rw-r--r-- | netbsd-2.0-xen-sparse/sys/arch/xen/i386/machdep.c | 4 |
3 files changed, 7 insertions, 1 deletions
diff --git a/netbsd-2.0-xen-sparse/mkbuildtree b/netbsd-2.0-xen-sparse/mkbuildtree index ef85a8922a..bd99cbda9a 100755 --- a/netbsd-2.0-xen-sparse/mkbuildtree +++ b/netbsd-2.0-xen-sparse/mkbuildtree @@ -93,7 +93,7 @@ abs_to_rel ${AD} ${AS} RS=$DESTPATH # Remove old copies of files and directories at the destination -for i in `find . -type f -o -type l` ; do rm -f ${AD}/${i#./} ; done +for i in `find sys -type f -o -type l` ; do rm -f ${AD}/${i#./} ; done # We now work from the destination directory cd ${AD} 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 a8967d75cb..d018b06a64 100644 --- 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 ded4538782..54752025b6 100644 --- 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 |