Browse Source

Plan 9 from Bell Labs 2010-07-09

David du Colombier 14 years ago
parent
commit
1808fdd49b
2 changed files with 6 additions and 2 deletions
  1. 1 1
      sys/man/1/man
  2. 5 1
      sys/src/9/pc/vgavesa.c

+ 1 - 1
sys/man/1/man

@@ -84,7 +84,7 @@ words given on the command line.
 .PP
 .B Sig
 prints the signature (i.e. C definition) of the
-.IR function 's
+.IR function s
 given on the command line.
 .SH FILES
 .TP

+ 5 - 1
sys/src/9/pc/vgavesa.c

@@ -140,7 +140,11 @@ havesize:
 		size = 16*1024*1024;
 	vgalinearaddr(scr, paddr, size);
 	hardscreen = scr->vaddr;
-	mtrr(paddr, size, "wc");
+	/* let mtrr harmlessly fail on old CPUs, e.g., P54C */
+	if (!waserror()){
+		mtrr(paddr, size, "wc");
+		poperror();
+	}
 }
 
 static void