Merge zizzer:/bk/linux into zeep.eecs.umich.edu:/z/saidi/work/m5-linux

[gem5.git] / arch / alpha / faults.hh

diff --git a/arch/alpha/faults.hh b/arch/alpha/faults.hh
index bc8a4da0ed7708a130671d4607f93bdb26b75416..45ac122dcd4b7eb211371296f515d3e53e60eedf 100644 (file)
--- a/arch/alpha/faults.hh
+++ b/arch/alpha/faults.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2003-2004 The Regents of The University of Michigan
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,11 +38,11 @@ enum Fault {
     Ndtb_Miss_Fault,           // DTB miss
     Pdtb_Miss_Fault,           // nested DTB miss
     Alignment_Fault,           // unaligned access
-    Dtb_Fault_Fault,           // DTB page fault
-    Dtb_Acv_Fault,             // DTB access violation
-    Itb_Miss_Fault,            // ITB miss
-    Itb_Fault_Fault,           // ITB page fault
-    Itb_Acv_Fault,             // ITB access violation
+    DTB_Fault_Fault,           // DTB page fault
+    DTB_Acv_Fault,             // DTB access violation
+    ITB_Miss_Fault,            // ITB miss
+    ITB_Fault_Fault,           // ITB page fault
+    ITB_Acv_Fault,             // ITB access violation
     Unimplemented_Opcode_Fault,        // invalid/unimplemented instruction
     Fen_Fault,                 // FP not-enabled fault
     Pal_Fault,                 // call_pal S/W interrupt