The following commit has been merged in the linux branch: commit 55f4e1d4fe88f16f773ba5bb31ce8c1ae63724af Author: Wu Zhangjin wuzhangjin@gmail.com Date: Wed Oct 21 22:51:46 2009 +0800

MIPS: Oprofile: Rename cpu_type from godson2 to loongson2

Unify the naming method between kernel and the user-space oprofile tool. Because loongson is used instead of godson in most of the places, we agreed to use loongson instead, which will simplify future maintenance.

Signed-off-by: Wu Zhangjin wuzhangjin@gmail.com Acked-by: Robert Richter robert.richter@amd.com Signed-off-by: Ralf Baechle ralf@linux-mips.org

diff --git a/arch/mips/oprofile/op_model_loongson2.c b/arch/mips/oprofile/op_model_loongson2.c index deed1d5..575cd14 100644 --- a/arch/mips/oprofile/op_model_loongson2.c +++ b/arch/mips/oprofile/op_model_loongson2.c @@ -22,7 +22,7 @@ * otherwise, the oprofile tool will not recognize this and complain about * "cpu_type 'unset' is not valid". */ -#define LOONGSON2_CPU_TYPE "mips/godson2" +#define LOONGSON2_CPU_TYPE "mips/loongson2"

#define LOONGSON2_COUNTER1_EVENT(event) ((event & 0x0f) << 5) #define LOONGSON2_COUNTER2_EVENT(event) ((event & 0x0f) << 9)