diff -r 02cb3deb8bac -r 5b3eadfbe988 src/arch/alpha/faults.hh
--- a/src/arch/alpha/faults.hh	Mon Sep 12 05:31:03 2011 -0700
+++ b/src/arch/alpha/faults.hh	Mon Sep 12 05:32:16 2011 -0700
@@ -68,7 +68,6 @@
     FaultName name() const {return _name;}
     FaultVect vect() {return _vect;}
     FaultStat & countStat() {return _count;}
-    bool isMachineCheckFault() const {return true;}
 };
 
 class AlignmentFault : public AlphaFault
diff -r 02cb3deb8bac -r 5b3eadfbe988 src/arch/power/faults.hh
--- a/src/arch/power/faults.hh	Mon Sep 12 05:31:03 2011 -0700
+++ b/src/arch/power/faults.hh	Mon Sep 12 05:32:16 2011 -0700
@@ -83,12 +83,6 @@
         : PowerFault("Alignment")
     {
     }
-
-    bool
-    isAlignmentFault() const
-    {
-        return true;
-    }
 };
 
 
diff -r 02cb3deb8bac -r 5b3eadfbe988 src/arch/sparc/faults.hh
--- a/src/arch/sparc/faults.hh	Mon Sep 12 05:31:03 2011 -0700
+++ b/src/arch/sparc/faults.hh	Mon Sep 12 05:32:16 2011 -0700
@@ -139,11 +139,7 @@
 class DivisionByZero : public SparcFault<DivisionByZero> {};
 
 class InternalProcessorError :
-    public SparcFault<InternalProcessorError>
-{
-  public:
-    bool isMachineCheckFault() const { return true; }
-};
+    public SparcFault<InternalProcessorError> {};
 
 class InstructionInvalidTSBEntry :
     public SparcFault<InstructionInvalidTSBEntry> {};
@@ -159,11 +155,7 @@
 class DataAccessProtection : public SparcFault<DataAccessProtection> {};
 
 class MemAddressNotAligned :
-    public SparcFault<MemAddressNotAligned>
-{
-  public:
-    bool isAlignmentFault() const { return true; }
-};
+    public SparcFault<MemAddressNotAligned> {};
 
 class LDDFMemAddressNotAligned : public SparcFault<LDDFMemAddressNotAligned> {};
 
diff -r 02cb3deb8bac -r 5b3eadfbe988 src/sim/faults.hh
--- a/src/sim/faults.hh	Mon Sep 12 05:31:03 2011 -0700
+++ b/src/sim/faults.hh	Mon Sep 12 05:32:16 2011 -0700
@@ -57,8 +57,6 @@
     virtual FaultName name() const = 0;
     virtual void invoke(ThreadContext * tc,
             StaticInstPtr inst = StaticInst::nullStaticInstPtr);
-    virtual bool isMachineCheckFault() const {return false;}
-    virtual bool isAlignmentFault() const {return false;}
 };
 
 class UnimpFault : public FaultBase