2 files changed, 22 insertions, 3 deletions
diff --git a/kern/linux/linux_system.cc b/kern/linux/linux_system.cc
index 91ad45157..539bac649 100644
--- a/kern/linux/linux_system.cc
+++ b/kern/linux/linux_system.cc
@@ -145,14 +145,29 @@ LinuxSystem::LinuxSystem(Params *p)
         printThreadEvent->schedule(addr + sizeof(MachInst) * 6);
 
     intStartEvent = new InterruptStartEvent(&pcEventQueue, "intStartEvent");
-    if (kernelSymtab->findAddress("do_entInt", addr))
+    if (palSymtab->findAddress("sys_int_21", addr))
         intStartEvent->schedule(addr + sizeof(MachInst) * 2);
+    else
+        panic("could not find symbol\n");
 
-    intEndEvent = new InterruptEndEvent(&pcEventQueue, "intStartEvent");
-    if (palSymtab->findAddress("Call_Pal_Rti", addr))
+    intEndEvent = new InterruptEndEvent(&pcEventQueue, "intEndEvent");
+    if (palSymtab->findAddress("rti_to_kern", addr))
         intEndEvent->schedule(addr + sizeof(MachInst));
     else
         panic("could not find symbol\n");
+
+    intEndEvent2 = new InterruptEndEvent(&pcEventQueue, "intEndEvent2");
+    if (palSymtab->findAddress("rti_to_user", addr))
+        intEndEvent2->schedule(addr + sizeof(MachInst));
+    else
+        panic("could not find symbol\n");
+
+
+    intEndEvent3 = new InterruptEndEvent(&pcEventQueue, "intEndEvent3");
+    if (kernelSymtab->findAddress("do_softirq", addr))
+        intEndEvent3->schedule(addr + sizeof(MachInst));
+    else
+        panic("could not find symbol\n");
 }
 
 LinuxSystem::~LinuxSystem()
@@ -167,6 +182,8 @@ LinuxSystem::~LinuxSystem()
     delete idleStartEvent;
     delete printThreadEvent;
     delete intStartEvent;
+    delete intEndEvent;
+    delete intEndEvent2;
 }
 
 
diff --git a/kern/linux/linux_system.hh b/kern/linux/linux_system.hh
index f5fd2b06b..5e3cba9b3 100644
--- a/kern/linux/linux_system.hh
+++ b/kern/linux/linux_system.hh
@@ -98,6 +98,8 @@ class LinuxSystem : public System
      * Event to bin Interrupts seperately from kernel code
      */
     InterruptEndEvent *intEndEvent;
+    InterruptEndEvent *intEndEvent2;
+    InterruptEndEvent *intEndEvent3;
 
     /** Grab the PCBB of the idle process when it starts */
     IdleStartEvent *idleStartEvent;