Merge branch 'mips-next-3.9' of git://git.linux-mips.org/pub/scm/john/linux-john into mips-for-linux-next

2 files changed, 5 insertions, 0 deletions

diff --git a/arch/mips/oprofile/common.c b/arch/mips/oprofile/common.c
index 56f2cf221c7d..af763e838fdd 100644
--- a/arch/mips/oprofile/common.c
+++ b/arch/mips/oprofile/common.c
@@ -78,6 +78,7 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
         switch (current_cpu_type()) {
         case CPU_5KC:
         case CPU_M14KC:
+        case CPU_M14KEC:
         case CPU_20KC:
         case CPU_24K:
         case CPU_25KF:
diff --git a/arch/mips/oprofile/op_model_mipsxx.c b/arch/mips/oprofile/op_model_mipsxx.c
index 1cfab95755b9..1fd361462c03 100644
--- a/arch/mips/oprofile/op_model_mipsxx.c
+++ b/arch/mips/oprofile/op_model_mipsxx.c
@@ -351,6 +351,10 @@ static int __init mipsxx_init(void)
                 op_model_mipsxx_ops.cpu_type = "mips/M14Kc";
                 break;
 
+        case CPU_M14KEC:
+                op_model_mipsxx_ops.cpu_type = "mips/M14KEc";
+                break;
+
         case CPU_20KC:
                 op_model_mipsxx_ops.cpu_type = "mips/20K";
                 break;