Automated merge with ssh://daystrom.m5sim.org//z/repo/m5

src/arch/x86/interrupts.cc

@@ -294,10 +294,9 @@ X86ISA::Interrupts::recvMessage(PacketPtr pkt)
       case 0:
         {
             TriggerIntMessage message = pkt->get<TriggerIntMessage>();
-            uint8_t vector = message.vector;
             DPRINTF(LocalApic,
                     "Got Trigger Interrupt message with vector %#x.\n",
-                    vector);
+                    message.vector);
             // Make sure we're really supposed to get this.
             assert((message.destMode == 0 && message.destination == id) ||
                    (bits((int)message.destination, id)));

src/dev/x86/i8259.cc

@@ -31,6 +31,8 @@
 #include "base/bitfield.hh"
 #include "dev/x86/i82094aa.hh"
 #include "dev/x86/i8259.hh"
+#include "mem/packet.hh"
+#include "mem/packet_access.hh"
 
 X86ISA::I8259::I8259(Params * p) : BasicPioDevice(p), IntDev(this),
                     latency(p->pio_latency), output(p->output),