Merge ktlim@zizzer:/bk/m5

into  zamp.eecs.umich.edu:/z/ktlim2/m5-proxyxc

arch/alpha/faults.cc:
    Hand merge.

--HG--
rename : arch/alpha/linux_process.cc => arch/alpha/linux/process.cc
rename : arch/alpha/tru64_process.cc => arch/alpha/tru64/process.cc
extra : convert_revision : 6ea1fae5be0ebd02eff330423d16da63b790516d

2 files changed, 0 insertions, 18 deletions

diff --git a/kern/kernel_stats.cc b/kern/kernel_stats.cc
index a887ebf09..b85d88145 100644
--- a/kern/kernel_stats.cc
+++ b/kern/kernel_stats.cc
@@ -137,19 +137,6 @@ Statistics::regStats(const string &_name)
         }
     }
 
-/*    _faults
-        .init(NumFaults)
-        .name(name() + ".faults")
-        .desc("number of faults")
-        .flags(total | pdf | nozero | nonan)
-        ;
-
-    for (int i = 1; i < NumFaults; ++i) {
-        const char *str = (*ListOfFaults[i])->name;
-        if (str)
-            _faults.subname(i, str);
-    }*/
-
     _mode
         .init(cpu_mode_num)
         .name(name() + ".mode_switch")
diff --git a/kern/kernel_stats.hh b/kern/kernel_stats.hh
index c0a7fb858..16ec721d0 100644
--- a/kern/kernel_stats.hh
+++ b/kern/kernel_stats.hh
@@ -175,11 +175,6 @@ class Statistics : public Serializable
     void ivlb() { _ivlb++; }
     void ivle() { _ivle++; }
     void hwrei() { _hwrei++; }
-    void fault(Fault fault)
-    {
-            if(fault != NoFault)
-                fault->stat()++;
-    }// FIXME: When there are no generic system fault objects, this will go back to _faults[fault]++; }
     void swpipl(int ipl);
     void mode(cpu_mode newmode, ExecContext *xc);
     void context(Addr oldpcbb, Addr newpcbb, ExecContext *xc);