From 8bf9709d912849a33c44cf3cd004a288d2106176 Mon Sep 17 00:00:00 2001
From: Kevin Lim <ktlim@umich.edu>
Date: Thu, 6 Jul 2006 16:26:44 -0400
Subject: [PATCH] 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
---
 src/dev/tsunami_pchip.hh | 2 +-
 src/sim/pseudo_inst.cc   | 1 -
 2 files changed, 1 insertion(+), 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"