diff options
| author | Kevin Lim <ktlim@umich.edu> | 2006-07-06 16:26:44 -0400 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2006-07-06 16:26:44 -0400 |
| commit | 8bf9709d912849a33c44cf3cd004a288d2106176 (patch) | |
| tree | 010309985a15e10ca911e00ee8b99abb74bedde1 | |
| parent | 8ae4f45bc4782b4ab1dc95dbca183e2cd926fc5b (diff) | |
| download | gem5-8bf9709d912849a33c44cf3cd004a288d2106176.tar.xz | |
Two minor FS compile fixes.
src/dev/tsunami_pchip.hh:
Need ULL() for 32-bit hosts.
src/sim/pseudo_inst.cc:
Forgot to remove sampler include from here.
--HG--
extra : convert_revision : 6ab6bdc721290167b4c2b78da3d28a4992eb24d5
| -rw-r--r-- | src/dev/tsunami_pchip.hh | 2 | ||||
| -rw-r--r-- | src/sim/pseudo_inst.cc | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/dev/tsunami_pchip.hh b/src/dev/tsunami_pchip.hh index b9e900526..2c97a1fea 100644 --- a/src/dev/tsunami_pchip.hh +++ b/src/dev/tsunami_pchip.hh @@ -46,7 +46,7 @@ class TsunamiPChip : public BasicPioDevice { protected: - static const Addr TsunamiPciBus0Config = 0x801fe000000; + static const Addr TsunamiPciBus0Config = ULL(0x801fe000000); /** Pchip control register */ uint64_t pctl; diff --git a/src/sim/pseudo_inst.cc b/src/sim/pseudo_inst.cc index 869805f5c..fcf0b957a 100644 --- a/src/sim/pseudo_inst.cc +++ b/src/sim/pseudo_inst.cc @@ -37,7 +37,6 @@ #include "sim/pseudo_inst.hh" #include "arch/vtophys.hh" #include "cpu/base.hh" -#include "cpu/sampler/sampler.hh" #include "cpu/thread_context.hh" #include "cpu/quiesce_event.hh" #include "kern/kernel_stats.hh" |