[src/trunk]: src/sys/arch CPU topology makes almost no sense for Xen, and pop...

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

details:   https://anonhg.NetBSD.org/src/rev/497e477b12c2
branches:  trunk
changeset: 746623:497e477b12c2
user:      ad <ad%NetBSD.org@localhost>
date:      Fri Apr 03 22:45:30 2020 +0000

description:
CPU topology makes almost no sense for Xen, and populates it with B/S values

diffstat:

 sys/arch/x86/x86/identcpu.c |  6 ++++--
 sys/arch/xen/conf/files.xen |  3 +--
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (45 lines):

diff -r ce8591014413 -r 497e477b12c2 sys/arch/x86/x86/identcpu.c
--- a/sys/arch/x86/x86/identcpu.c       Fri Apr 03 22:20:36 2020 +0000
+++ b/sys/arch/x86/x86/identcpu.c       Fri Apr 03 22:45:30 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: identcpu.c,v 1.100 2019/12/21 12:53:54 ad Exp $        */
+/*     $NetBSD: identcpu.c,v 1.101 2020/04/03 22:45:30 ad Exp $        */
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.100 2019/12/21 12:53:54 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.101 2020/04/03 22:45:30 ad Exp $");
 
 #include "opt_xen.h"
 
@@ -950,7 +950,9 @@
                cpu_probe_fpu(ci);
        }
 
+#ifndef XEN
        x86_cpu_topology(ci);
+#endif
 
        if (cpu_vendor != CPUVENDOR_AMD && (ci->ci_feat_val[0] & CPUID_TM) &&
            (rdmsr(MSR_MISC_ENABLE) & (1 << 3)) == 0) {
diff -r ce8591014413 -r 497e477b12c2 sys/arch/xen/conf/files.xen
--- a/sys/arch/xen/conf/files.xen       Fri Apr 03 22:20:36 2020 +0000
+++ b/sys/arch/xen/conf/files.xen       Fri Apr 03 22:45:30 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.xen,v 1.179 2019/09/07 18:56:01 maxv Exp $
+#      $NetBSD: files.xen,v 1.180 2020/04/03 22:45:30 ad Exp $
 #      NetBSD: files.x86,v 1.10 2003/10/08 17:30:00 bouyer Exp 
 #      NetBSD: files.i386,v 1.254 2004/03/25 23:32:10 jmc Exp 
 
@@ -157,7 +157,6 @@
 file   arch/x86/x86/vm_machdep.c       machdep
 file   arch/x86/x86/x86_autoconf.c     machdep & xenpvhvm
 file   arch/x86/x86/x86_machdep.c      machdep
-file   arch/x86/x86/cpu_topology.c     machdep
 file   arch/x86/x86/platform.c         machdep
 
 include        "arch/xen/conf/files.compat"