From ee53c48657bb9fd850324a153cab31f9c074ef3a Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Wed, 1 Feb 2006 17:54:30 +0000
Subject: [PATCH] --- yaml --- r: 19919 b: refs/heads/master c:
 fcfd980c833bd5ca1df9ca877b3e968e4da05b24 h: refs/heads/master i:   19917:
 f79c306dfe5e0dfa2223aac3f59768cb34afd973   19915:
 e7b90af7e0a83dd1d1103eec74a2a4c589be4c44   19911:
 80766a08bcb5e3219d4406f0c729f4514b9957a5   19903:
 0c78e4bbb8db8ff38c3175b2249e9c87f54cd872 v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/mips/oprofile/common.c          | 1 +
 trunk/arch/mips/oprofile/op_model_mipsxx.c | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5a3295f72fbc..82496b4ebe13 100644
--- 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
index 65de5e3d5a7b..935dd851f480 100644
--- 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
index dd6d189dccf8..95d488ca0754 100644
--- 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;