Browse Source

Plan 9 from Bell Labs 2007-03-21

David du Colombier 13 years ago
parent
commit
8b1d647be0
5 changed files with 22 additions and 8 deletions
  1. 3 2
      dist/replica/_plan9.db
  2. 2 2
      dist/replica/plan9.db
  3. 3 0
      dist/replica/plan9.log
  4. 8 1
      sys/man/3/fs
  5. 6 3
      sys/src/9/pc/apic.c

+ 3 - 2
dist/replica/_plan9.db

@@ -7587,7 +7587,7 @@ sys/man/3/dup - 664 sys sys 1015024778 1099
 sys/man/3/env - 664 sys sys 1015024778 1409
 sys/man/3/ether - 664 sys sys 984709635 2563
 sys/man/3/floppy - 664 sys sys 954378905 881
-sys/man/3/fs - 664 sys sys 1165622643 2702
+sys/man/3/fs - 664 sys sys 1174447885 2890
 sys/man/3/i82365 - 664 sys sys 954378906 884
 sys/man/3/ip - 664 sys sys 1169599032 22614
 sys/man/3/kbmap - 664 sys sys 1131110122 1732
@@ -7962,7 +7962,7 @@ sys/src/9/mtx/uarti8250.c - 664 sys sys 1018721288 11590
 sys/src/9/pc - 20000000775 sys sys 1161233143 0
 sys/src/9/pc/a100p.cp - 444 sys sys 1159735144 21984
 sys/src/9/pc/apbootstrap.s - 664 sys sys 1131293655 3037
-sys/src/9/pc/apic.c - 664 sys sys 1173288116 8927
+sys/src/9/pc/apic.c - 664 sys sys 1174415344 8991
 sys/src/9/pc/apm.c - 664 sys sys 1131290210 3723
 sys/src/9/pc/apmjump.s - 664 sys sys 1032058947 1527
 sys/src/9/pc/archmp.c - 664 sys sys 1131290214 2357
@@ -15687,3 +15687,4 @@ usr/glenda/lib/profile - 664 glenda glenda 1105128663 890
 usr/glenda/readme.acme - 664 glenda glenda 1019860628 4753
 usr/glenda/readme.rio - 664 glenda glenda 1019860628 6370
 usr/glenda/tmp - 20000000775 glenda glenda 1018802620 0
+sys/man/3/fs - 664 sys sys 1174450141 2894

+ 2 - 2
dist/replica/plan9.db

@@ -7587,7 +7587,7 @@ sys/man/3/dup - 664 sys sys 1015024778 1099
 sys/man/3/env - 664 sys sys 1015024778 1409
 sys/man/3/ether - 664 sys sys 984709635 2563
 sys/man/3/floppy - 664 sys sys 954378905 881
-sys/man/3/fs - 664 sys sys 1165622643 2702
+sys/man/3/fs - 664 sys sys 1174450141 2894
 sys/man/3/i82365 - 664 sys sys 954378906 884
 sys/man/3/ip - 664 sys sys 1169599032 22614
 sys/man/3/kbmap - 664 sys sys 1131110122 1732
@@ -7962,7 +7962,7 @@ sys/src/9/mtx/uarti8250.c - 664 sys sys 1018721288 11590
 sys/src/9/pc - 20000000775 sys sys 1161233143 0
 sys/src/9/pc/a100p.cp - 444 sys sys 1159735144 21984
 sys/src/9/pc/apbootstrap.s - 664 sys sys 1131293655 3037
-sys/src/9/pc/apic.c - 664 sys sys 1173288116 8927
+sys/src/9/pc/apic.c - 664 sys sys 1174415344 8991
 sys/src/9/pc/apm.c - 664 sys sys 1131290210 3723
 sys/src/9/pc/apmjump.s - 664 sys sys 1032058947 1527
 sys/src/9/pc/archmp.c - 664 sys sys 1131290214 2357

+ 3 - 0
dist/replica/plan9.log

@@ -47902,3 +47902,6 @@
 1174278606 2 c sys/src/cmd/aquarela/smbtrans2query.c - 664 sys sys 1174276975 8262
 1174332606 0 c 386/bin/aquarela - 775 sys sys 1174332054 333082
 1174332606 1 c 386/bin/cifscmd - 775 sys sys 1174332056 343905
+1174415407 0 c sys/src/9/pc/apic.c - 664 sys sys 1174415344 8991
+1174449606 0 c sys/man/3/fs - 664 sys sys 1174447885 2890
+1174451407 0 c sys/man/3/fs - 664 sys sys 1174450141 2894

+ 8 - 1
sys/man/3/fs

@@ -38,7 +38,7 @@ arguments are interpreted in the name space of the writer.
 .BI mirror " new files" \fR...
 The device
 .I new
-corresponds to a RAID 1 mirroring of
+corresponds to a RAID-1-like mirroring of
 .IR files .
 Writes to
 .BI new
@@ -136,6 +136,7 @@ Save the configuration:
 .EX
 cp /dev/fs/ctl /dev/fd0disk
 .EE
+.LP
 To load the configuration automatically at boot time,
 add this to
 .IR plan9.ini :
@@ -144,9 +145,15 @@ add this to
 fsconfig=/dev/fd0disk
 .EE
 .SH "SEE ALSO"
+.IR dd (1),
 .IR kfs (4),
 .IR fs (8),
 .IR plan9.ini (8),
+.IR prep (8),
 .IR venti (8)
 .SH SOURCE
 .B /sys/src/9/port/devfs.c
+.SH BUGS
+Mirrors are RAID-like but not RAID.
+There is no fancy recovery mechanism and
+no automatic initial copying from a master drive to its mirror drives.

+ 6 - 3
sys/src/9/pc/apic.c

@@ -150,9 +150,12 @@ lapictimerinit(void)
 		lapictimer.max = lapictimer.hz/HZ;
 		lapictimer.min = lapictimer.hz/(100*HZ);
 
-		if(lapictimer.hz > hz)
-			panic("lapic clock faster than cpu clock %lld > %lld",
-				lapictimer.hz, hz);
+		if(lapictimer.hz > hz-(hz/10)){
+			if(lapictimer.hz > hz+(hz/10))
+				panic("lapic clock %lld > cpu clock > %lld\n",
+					lapictimer.hz, hz);
+			lapictimer.hz = hz;
+		}
 		lapictimer.div = hz/lapictimer.hz;
 	}
 }