Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/xen/x86 fix botch with merging in changes from x86/...



details:   https://anonhg.NetBSD.org/src/rev/d88dab33dba5
branches:  trunk
changeset: 747590:d88dab33dba5
user:      cegger <cegger%NetBSD.org@localhost>
date:      Tue Sep 22 13:59:42 2009 +0000

description:
fix botch with merging in changes from x86/x86/cpu.c:

don't use wbinvd(). Xen flushes the cache for us.
This makes DomU boot again.
Spotted by bouyer@.

diffstat:

 sys/arch/xen/x86/cpu.c |  6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diffs (27 lines):

diff -r dc6c027686bb -r d88dab33dba5 sys/arch/xen/x86/cpu.c
--- a/sys/arch/xen/x86/cpu.c    Tue Sep 22 13:31:26 2009 +0000
+++ b/sys/arch/xen/x86/cpu.c    Tue Sep 22 13:59:42 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.c,v 1.34 2009/07/30 13:56:57 cegger Exp $  */
+/*     $NetBSD: cpu.c,v 1.35 2009/09/22 13:59:42 cegger Exp $  */
 /* NetBSD: cpu.c,v 1.18 2004/02/20 17:35:01 yamt Exp  */
 
 /*-
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.34 2009/07/30 13:56:57 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.35 2009/09/22 13:59:42 cegger Exp $");
 
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
@@ -565,8 +565,6 @@
        }
 
        atomic_or_32(&cpus_running, ci->ci_cpumask);
-
-       wbinvd();
        atomic_or_32(&ci->ci_flags, CPUF_RUNNING);
 }
 



Home | Main Index | Thread Index | Old Index