[src/netbsd-7]: src/sys/arch/x86/x86 Pull up following revision(s) (requested...

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

details:   https://anonhg.NetBSD.org/src/rev/34234f8471f3
branches:  netbsd-7
changeset: 798801:34234f8471f3
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Jan 08 11:15:45 2015 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #393):
        sys/arch/x86/x86/intel_busclock.c: revision 1.20
- Round off some bus clock values.
- Add 333.33MHz for Pentium 4.

diffstat:

 sys/arch/x86/x86/intel_busclock.c |  11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diffs (39 lines):

diff -r 5d536c5d7f13 -r 34234f8471f3 sys/arch/x86/x86/intel_busclock.c
--- a/sys/arch/x86/x86/intel_busclock.c Thu Jan 08 11:07:43 2015 +0000
+++ b/sys/arch/x86/x86/intel_busclock.c Thu Jan 08 11:15:45 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_busclock.c,v 1.19 2014/07/25 14:34:22 msaitoh Exp $      */
+/*     $NetBSD: intel_busclock.c,v 1.19.2.1 2015/01/08 11:15:45 martin Exp $   */
 
 /*-
  * Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_busclock.c,v 1.19 2014/07/25 14:34:22 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_busclock.c,v 1.19.2.1 2015/01/08 11:15:45 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -316,7 +316,7 @@
                switch (bus) {
                case 0:
                        bus_clock = (CPUID_TO_MODEL(ci->ci_signature) == 2) ?
-                           10000 : 26666;
+                           10000 : 26667;
                        break;
                case 1:
                        bus_clock = 13333;
@@ -325,7 +325,10 @@
                        bus_clock = 20000;
                        break;
                case 3:
-                       bus_clock = 16666;
+                       bus_clock = 16667;
+                       break;
+               case 4:
+                       bus_clock = 33333;
                        break;
                default:
                        aprint_debug("%s: unknown Pentium 4 (model %d) "