From: Ali Saidi <saidi@eecs.umich.edu>
Date: Mon, 21 Jun 2004 05:04:48 +0000 (-0400)
Subject: Merge saidi@zizzer.eecs.umich.edu:/bk/linux
X-Git-Tag: m5_1.0_tutorial~296
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3f7b780af5530cc60228ebd3e895ab26d477614e;p=gem5.git

Merge saidi@zizzer.eecs.umich.edu:/bk/linux
into ali-saidis-computer.local:/research/linux

--HG--
extra : convert_revision : 446dc5fad11a6b29954dc5b1e974430853aa2969
---

3f7b780af5530cc60228ebd3e895ab26d477614e
diff --cc cpu/exec_context.hh
index 08879b3b5,4f62fa6fa..b47f5cd08
--- a/cpu/exec_context.hh
+++ b/cpu/exec_context.hh
@@@ -31,8 -31,8 +31,9 @@@
  
  #include "sim/host.hh"
  #include "mem/mem_req.hh"
 +#include "mem/functional_mem/functional_memory.hh"
  #include "sim/serialize.hh"
+ #include "targetarch/byte_swap.hh"
  
  // forward declaration: see functional_memory.hh
  class FunctionalMemory;