From cef3aab4ff1460a78fdfb425878b24f19a6478d4 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Fri, 9 Dec 2005 12:42:13 +0000
Subject: [PATCH] --- yaml --- r: 17771 b: refs/heads/master c:
 2065988e9fb1628de7958b0f7f709b93302f7b97 h: refs/heads/master i:   17769:
 026f8b7ccf61b8727d78b97e365871caecdbaea2   17767:
 e399905d4071e1abb580299ae6b95a654bf8c5b0 v: v3

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

diff --git a/[refs] b/[refs]
index c5b8a7b7f1bf..91b510292319 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9efeae9a5cae7e7bdacff666a1d689f5b2901c64
+refs/heads/master: 2065988e9fb1628de7958b0f7f709b93302f7b97
diff --git a/trunk/arch/mips/oprofile/common.c b/trunk/arch/mips/oprofile/common.c
index dd2cc42f1b6d..53f9889b30ed 100644
--- a/trunk/arch/mips/oprofile/common.c
+++ b/trunk/arch/mips/oprofile/common.c
@@ -75,7 +75,10 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
 	int res;
 
 	switch (current_cpu_data.cputype) {
+	case CPU_5KC:
+	case CPU_20KC:
 	case CPU_24K:
+	case CPU_25KF:
 		lmodel = &op_model_mipsxx;
 		break;
 
diff --git a/trunk/arch/mips/oprofile/op_model_mipsxx.c b/trunk/arch/mips/oprofile/op_model_mipsxx.c
index d97bbff031e5..1d1eee407faf 100644
--- a/trunk/arch/mips/oprofile/op_model_mipsxx.c
+++ b/trunk/arch/mips/oprofile/op_model_mipsxx.c
@@ -189,10 +189,22 @@ static int __init mipsxx_init(void)
 
 	op_model_mipsxx.num_counters = counters;
 	switch (current_cpu_data.cputype) {
+	case CPU_20KC:
+		op_model_mipsxx.cpu_type = "mips/20K";
+		break;
+
 	case CPU_24K:
 		op_model_mipsxx.cpu_type = "mips/24K";
 		break;
 
+	case CPU_25KF:
+		op_model_mipsxx.cpu_type = "mips/25K";
+		break;
+
+	case CPU_5KC:
+		op_model_mipsxx.cpu_type = "mips/5K";
+		break;
+
 	default:
 		printk(KERN_ERR "Profiling unsupported for this CPU\n");