summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkolya <kolya>2008-09-03 14:10:47 +0000
committerkolya <kolya>2008-09-03 14:10:47 +0000
commitf68317533e8dc6cebd37b2d8c95d09ee666f90b0 (patch)
treee3aca22b3e10050752227f7f6316701269eb50f7
parent35a6cf84ec5ee903d2c06726f89a7816fd39d267 (diff)
downloadxv6-labs-f68317533e8dc6cebd37b2d8c95d09ee666f90b0.tar.gz
xv6-labs-f68317533e8dc6cebd37b2d8c95d09ee666f90b0.tar.bz2
xv6-labs-f68317533e8dc6cebd37b2d8c95d09ee666f90b0.zip
make bochsrc work for bochs 2.2.6
-rwxr-xr-xdot-bochsrc2
-rw-r--r--xv6-rev2.tar.gzbin724370 -> 724391 bytes
2 files changed, 1 insertions, 1 deletions
diff --git a/dot-bochsrc b/dot-bochsrc
index 650cfa5..ba13db7 100755
--- a/dot-bochsrc
+++ b/dot-bochsrc
@@ -107,7 +107,7 @@ romimage: file=$BXSHARE/BIOS-bochs-latest
# 650Mhz Athlon K-7 with Linux 2.4.4/egcs-2.91.66 2 to 2.5 Mips
# 400Mhz Pentium II with Linux 2.0.36/egcs-1.0.3 1 to 1.8 Mips
#=======================================================================
-cpu: count=2, ips=10000000, reset_on_triple_fault=0
+cpu: count=2, ips=10000000
#=======================================================================
# MEGS
diff --git a/xv6-rev2.tar.gz b/xv6-rev2.tar.gz
index f2826af..f334fa0 100644
--- a/xv6-rev2.tar.gz
+++ b/xv6-rev2.tar.gz
Binary files differ