Hand merge

[gem5.git] / cpu / intr_control.hh

diff --git a/cpu/intr_control.hh b/cpu/intr_control.hh
index 660d6d70458f423ccee856798ac1e935d764a372..8cdc6b61ba9a9dd7221b71b34a383f7822ee8cb1 100644 (file)
--- a/cpu/intr_control.hh
+++ b/cpu/intr_control.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2001-2003 The Regents of The University of Michigan
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29,9 +29,13 @@
 #ifndef __INTR_CONTROL_HH__
 #define __INTR_CONTROL_HH__
 
-#include "misc.hh"
-#include "base_cpu.hh"
-#include "sim_object.hh"
+#include <vector>
+#include "base/misc.hh"
+#include "cpu/base_cpu.hh"
+#include "sim/sim_object.hh"
+#include "sim/system.hh"
+#include "cpu/exec_context.hh"
+
 
 class IntrControl : public SimObject
 {
@@ -41,16 +45,10 @@ class IntrControl : public SimObject
 
     void clear(int int_num, int index = 0);
     void post(int int_num, int index = 0);
+    void clear(int cpu_id, int int_num, int index);
+    void post(int cpu_id, int int_num, int index);
 };
 
-inline void
-IntrControl::post(int int_num, int index)
-{ cpu->post_interrupt(int_num, index); }
-
-inline void
-IntrControl::clear(int int_num, int index)
-{ cpu->clear_interrupt(int_num, index); }
-
 #endif // __INTR_CONTROL_HH__