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

diff --git a/src/dev/tsunami_pchip.hh b/src/dev/tsunami_pchip.hh
index b9e900526545d59511fb114ddd4369b54a8c96c2..2c97a1feac092919e0a79952561a0da18e8d2099 100644 (file)
--- 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 869805f5c7e48f10840435493d987aa9f6388775..fcf0b957a7f97f488d629ef82d0d205a929b2968 100644 (file)
--- 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"