---

yaml --- r: 19919 b: refs/heads/master c: fcfd980 h: refs/heads/master i: 19917: f79c306 19915: e7b90af 19911: 80766a0 19903: 0c78e4b v: v3
git-mirror · Feb 7, 2006 · ee53c48 · ee53c48
1 parent 03fa946
commit ee53c48
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1e30a6347630ca7eeee2f46f826f05bbe80bb25
+refs/heads/master: fcfd980c833bd5ca1df9ca877b3e968e4da05b24
diff --git a/trunk/arch/mips/oprofile/common.c b/trunk/arch/mips/oprofile/common.c
@@ -79,6 +79,7 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
 	case CPU_20KC:
 	case CPU_24K:
 	case CPU_25KF:
+	case CPU_34K:
 	case CPU_SB1:
 	case CPU_SB1A:
 		lmodel = &op_model_mipsxx;

diff --git a/trunk/arch/mips/oprofile/op_model_mipsxx.c b/trunk/arch/mips/oprofile/op_model_mipsxx.c
@@ -201,6 +201,12 @@ static int __init mipsxx_init(void)
 		op_model_mipsxx.cpu_type = "mips/25K";
 		break;
 
+#ifndef CONFIG_SMP
+	case CPU_34K:
+		op_model_mipsxx.cpu_type = "mips/34K";
+		break;
+#endif
+
 	case CPU_5KC:
 		op_model_mipsxx.cpu_type = "mips/5K";
 		break;