diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2007-03-03 19:03:22 -0500 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2007-03-03 19:03:22 -0500 |
| commit | 82874eefca231fa960fbd39a90ed98929915c414 (patch) | |
| tree | 8646c2358edec660d123e45d20885a366d0815de /src/cpu/intr_control.hh | |
| parent | 61178c8de20d334e9c5cf0454d453880a5fff928 (diff) | |
| parent | 1694c65ba169a555bd642d3352c65be41a36ce4d (diff) | |
| download | gem5-82874eefca231fa960fbd39a90ed98929915c414.tar.xz | |
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem
--HG--
extra : convert_revision : fd6464c9883783c7c2cbefba317f4a0f20dd24cb
Diffstat (limited to 'src/cpu/intr_control.hh')
| -rw-r--r-- | src/cpu/intr_control.hh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cpu/intr_control.hh b/src/cpu/intr_control.hh index 2e3f9e038..c6f75abf0 100644 --- a/src/cpu/intr_control.hh +++ b/src/cpu/intr_control.hh @@ -42,8 +42,8 @@ class IntrControl : public SimObject { public: - BaseCPU *cpu; - IntrControl(const std::string &name, BaseCPU *c); + System *sys; + IntrControl(const std::string &name, System *s); void clear(int int_num, int index = 0); void post(int int_num, int index = 0); |