[src/netbsd-1-5]: src/sys/arch/i386/i386 Pull up version 1.393:

[fvdl <fvdl%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/87c5ea5b73e6
branches:  netbsd-1-5
changeset: 489135:87c5ea5b73e6
user:      fvdl <fvdl%NetBSD.org@localhost>
date:      Thu Aug 17 18:52:55 2000 +0000

description:
Pull up version 1.393:

      Move identifycpu to a place where it gets called earlier in the
      process, so that special setup functions needed for some CPUs will
      be run before some things (like UVM) are inited.

      Add vm_page_zero_enable = FALSE to the cyrix 6x86 case, as page
      zeroing while idle causes problems.

diffstat:

 sys/arch/i386/i386/machdep.c |  17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diffs (66 lines):

diff -r 5b3a9ac86274 -r 87c5ea5b73e6 sys/arch/i386/i386/machdep.c
--- a/sys/arch/i386/i386/machdep.c      Thu Aug 17 18:50:53 2000 +0000
+++ b/sys/arch/i386/i386/machdep.c      Thu Aug 17 18:52:55 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.389.2.1 2000/08/16 23:18:22 thorpej Exp $        */
+/*     $NetBSD: machdep.c,v 1.389.2.2 2000/08/17 18:52:55 fvdl Exp $   */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -119,6 +119,7 @@
 
 #include <vm/vm.h>
 #include <vm/vm_kern.h>
+#include <uvm/uvm_page.h>
 
 #include <sys/sysctl.h>
 
@@ -277,7 +278,8 @@
        initmsgbuf((caddr_t)msgbuf_vaddr, round_page(MSGBUFSIZE));
 
        printf(version);
-       identifycpu();
+
+       printf("cpu0: %s\n", cpu_model);
 
        format_bytes(pbuf, sizeof(pbuf), ptoa(physmem));
        printf("total memory = %s\n", pbuf);
@@ -647,8 +649,6 @@
        }
 };
 
-#define CPUDEBUG
-
 void
 cyrix6x86_cpu_setup()
 {
@@ -664,6 +664,12 @@
        cyrix_write_reg(0x3c, cyrix_read_reg(0x3c) | 0x87);
        /* disable access to ccr4/ccr5 */
        cyrix_write_reg(0xC3, cyrix_read_reg(0xC3) & ~0x10);
+
+       /*      
+        * XXX disable page zero in the idle loop, it seems to
+        * cause panics on these CPUs.
+        */
+       vm_page_zero_enable = FALSE;
 }
 
 void
@@ -756,7 +762,6 @@
 
        sprintf(cpu_model, "%s %s%s (%s-class)", vendorname, modifier, name,
                classnames[class]);
-       printf("cpu0: %s\n", cpu_model);
 
        cpu_class = class;
 
@@ -1727,6 +1732,8 @@
                       ptoa(physmem), 2*1024*1024UL);
                cngetc();
        }
+
+       identifycpu();
 }
 
 struct queue {