From 91e0db63c493b367c17e2d4a1238554f16bd9ca7 Mon Sep 17 00:00:00 2001
From: Stanislav Shwartsman <sshwarts@users.sourceforge.net>
Date: Mon, 3 Dec 2007 21:43:14 +0000
Subject: [PATCH] no need to invalidate prefetch queue for RDMSR/WRMSR

---
 bochs/cpu/cpu.cc       | 8 +++-----
 bochs/cpu/proc_ctrl.cc | 4 +---
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/bochs/cpu/cpu.cc b/bochs/cpu/cpu.cc
index a80e49f0c..a9edd6493 100644
--- a/bochs/cpu/cpu.cc
+++ b/bochs/cpu/cpu.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: cpu.cc,v 1.184 2007-11-27 22:12:44 sshwarts Exp $
+// $Id: cpu.cc,v 1.185 2007-12-03 21:43:14 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -557,11 +557,9 @@ unsigned BX_CPU_C::handleAsyncEvent(void)
     if (BX_CPU_THIS_PTR local_apic.INTR)
       vector = BX_CPU_THIS_PTR local_apic.acknowledge_int();
     else
-      vector = DEV_pic_iac(); // may set INTR with next interrupt
-#else
-    // if no local APIC, always acknowledge the PIC.
-    vector = DEV_pic_iac(); // may set INTR with next interrupt
 #endif
+      // if no local APIC, always acknowledge the PIC.
+      vector = DEV_pic_iac(); // may set INTR with next interrupt
     BX_CPU_THIS_PTR errorno = 0;
     BX_CPU_THIS_PTR EXT = 1; /* external event */
     BX_INSTR_HWINTERRUPT(BX_CPU_ID, vector,
diff --git a/bochs/cpu/proc_ctrl.cc b/bochs/cpu/proc_ctrl.cc
index 59f4bf270..b8499893a 100644
--- a/bochs/cpu/proc_ctrl.cc
+++ b/bochs/cpu/proc_ctrl.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: proc_ctrl.cc,v 1.184 2007-12-03 20:49:24 sshwarts Exp $
+// $Id: proc_ctrl.cc,v 1.185 2007-12-03 21:43:14 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -1693,8 +1693,6 @@ void BX_CPU_C::RDMSR(bxInstruction_c *i)
 void BX_CPU_C::WRMSR(bxInstruction_c *i)
 {
 #if BX_CPU_LEVEL >= 5
-  invalidate_prefetch_q();
-
   if (!real_mode() && CPL!=0) {
     BX_ERROR(("WRMSR: CPL!=0 not in real mode"));
     exception(BX_GP_EXCEPTION, 0, 0);