Merge with main repository.

[gem5.git] / src / arch / mips / vtophys.hh

diff --git a/src/arch/mips/vtophys.hh b/src/arch/mips/vtophys.hh
index 2e9ced9d413762ca581f503c28efb0ff05a06021..a3fbdd457a5191d635b55eaf6a7f6fd8bf460fbe 100644 (file)
--- a/src/arch/mips/vtophys.hh
+++ b/src/arch/mips/vtophys.hh
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2002-2005 The Regents of The University of Michigan
+ * Copyright (c) 2007 MIPS Technologies, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25,8 +26,8 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * Authors: Nathan Binkert
- *          Steve Reinhardt
+ * Authors: Ali Saidi
+ *          Nathan Binkert
  *          Jaidev Patwardhan
  */
 
@@ -34,16 +35,11 @@
 #define __ARCH_MIPS_VTOPHYS_H__
 
 #include "arch/mips/isa_traits.hh"
-#include "arch/mips/pagetable.hh"
 #include "arch/mips/utility.hh"
 
-
 class ThreadContext;
-class FunctionalPort;
 
 namespace MipsISA {
-
-
     Addr vtophys(Addr vaddr);
     Addr vtophys(ThreadContext *tc, Addr vaddr);