From 297cdb4e625c2e651c02b2cdd6633b341d903781 Mon Sep 17 00:00:00 2001
From: Mark Mason <mason@broadcom.com>
Date: Tue, 17 Jan 2006 12:06:32 -0800
Subject: [PATCH] --- yaml --- r: 19894 b: refs/heads/master c:
 c03bc121212ecb36120b118a94c1b91a2e07b7b2 h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/mips/oprofile/Makefile          | 1 +
 trunk/arch/mips/oprofile/common.c          | 2 ++
 trunk/arch/mips/oprofile/op_model_mipsxx.c | 5 +++++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 765189be53e7..bf153c2364c4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c91cc57bc9cfd337804d70bc9bff6a012aa8b83
+refs/heads/master: c03bc121212ecb36120b118a94c1b91a2e07b7b2
diff --git a/trunk/arch/mips/oprofile/Makefile b/trunk/arch/mips/oprofile/Makefile
index 354261d37d62..0a50aad5bbe4 100644
--- a/trunk/arch/mips/oprofile/Makefile
+++ b/trunk/arch/mips/oprofile/Makefile
@@ -12,4 +12,5 @@ oprofile-y				:= $(DRIVER_OBJS) common.o
 
 oprofile-$(CONFIG_CPU_MIPS32)		+= op_model_mipsxx.o
 oprofile-$(CONFIG_CPU_MIPS64)		+= op_model_mipsxx.o
+oprofile-$(CONFIG_CPU_SB1)		+= op_model_mipsxx.o
 oprofile-$(CONFIG_CPU_RM9000)		+= op_model_rm9000.o
diff --git a/trunk/arch/mips/oprofile/common.c b/trunk/arch/mips/oprofile/common.c
index 53f9889b30ed..65de5e3d5a7b 100644
--- a/trunk/arch/mips/oprofile/common.c
+++ b/trunk/arch/mips/oprofile/common.c
@@ -79,6 +79,8 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
 	case CPU_20KC:
 	case CPU_24K:
 	case CPU_25KF:
+	case CPU_SB1:
+	case CPU_SB1A:
 		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 1d1eee407faf..dd6d189dccf8 100644
--- a/trunk/arch/mips/oprofile/op_model_mipsxx.c
+++ b/trunk/arch/mips/oprofile/op_model_mipsxx.c
@@ -205,6 +205,11 @@ static int __init mipsxx_init(void)
 		op_model_mipsxx.cpu_type = "mips/5K";
 		break;
 
+	case CPU_SB1:
+	case CPU_SB1A:
+		op_model_mipsxx.cpu_type = "mips/sb1";
+		break;
+
 	default:
 		printk(KERN_ERR "Profiling unsupported for this CPU\n");