summaryrefslogtreecommitdiff
path: root/kern/freebsd/freebsd_system.cc
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2006-03-03 14:25:26 -0500
committerAli Saidi <saidi@eecs.umich.edu>2006-03-03 14:25:26 -0500
commit9ad917858763bb44c8e6e22b7bb370fd50d518df (patch)
treeeac667084b6627aaca784aa2061256a5750726ab /kern/freebsd/freebsd_system.cc
parent7546fabe68a1dc6ec9b9e020f5e2b1cc0aa31c21 (diff)
parent0bf25c595364f7ca9b5e632c84fcf0d35dc3490a (diff)
downloadgem5-9ad917858763bb44c8e6e22b7bb370fd50d518df.tar.xz
Merge zizzer:/bk/m5
into zeep.eecs.umich.edu:/z/saidi/work/m5.head --HG-- extra : convert_revision : 8f463682e32a457cd9171c63dcec5209cb850b56
Diffstat (limited to 'kern/freebsd/freebsd_system.cc')
-rw-r--r--kern/freebsd/freebsd_system.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/kern/freebsd/freebsd_system.cc b/kern/freebsd/freebsd_system.cc
index 24d228b5f..7ba385267 100644
--- a/kern/freebsd/freebsd_system.cc
+++ b/kern/freebsd/freebsd_system.cc
@@ -33,6 +33,7 @@
*
*/
+#include "arch/alpha/system.hh"
#include "base/loader/symtab.hh"
#include "cpu/exec_context.hh"
#include "kern/freebsd/freebsd_system.hh"
@@ -49,7 +50,7 @@ using namespace std;
using namespace TheISA;
FreebsdSystem::FreebsdSystem(Params *p)
- : System(p)
+ : AlphaSystem(p)
{
/**
* Any time DELAY is called just skip the function.
@@ -143,7 +144,7 @@ END_INIT_SIM_OBJECT_PARAMS(FreebsdSystem)
CREATE_SIM_OBJECT(FreebsdSystem)
{
- System::Params *p = new System::Params;
+ AlphaSystem::Params *p = new AlphaSystem::Params;
p->name = getInstanceName();
p->boot_cpu_frequency = boot_cpu_frequency;
p->memctrl = memctrl;