[PATCH] oprofile/loongson2: rename cpu_type from godson2 to loongson2

[Wu Zhangjin]

This patch try to unify the naming method between kernel and the
user-space oprofile tool. 'Cause loongson is used instead of godson in
most of the places, and just confer with the developer of the user-space
tool, we are agreed to use loongson instead, which will help a lot to
the future maintaining.

(This patch is very important to help the user-space support upstream,
 so, Ralf, could you please merge it into your -queue branch, thanks!)

Signed-off-by: Wu Zhangjin <wuzhangjin@...>
---
 arch/mips/oprofile/op_model_loongson2.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/mips/oprofile/op_model_loongson2.c b/arch/mips/oprofile/op_model_loongson2.c
index 9536b21..08d4b09 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)
--
1.6.2.1

[Robert Richter-3]

On 21.10.09 22:51:46, Wu Zhangjin wrote:

> This patch try to unify the naming method between kernel and the
> user-space oprofile tool. 'Cause loongson is used instead of godson in
> most of the places, and just confer with the developer of the user-space
> tool, we are agreed to use loongson instead, which will help a lot to
> the future maintaining.
>
> (This patch is very important to help the user-space support upstream,
>  so, Ralf, could you please merge it into your -queue branch, thanks!)
>
> Signed-off-by: Wu Zhangjin <wuzhangjin@...>

Acked-by: Robert Richter <robert.richter@...>

Ralf, please apply to your tree.

Thanks.

-Robert

--
Advanced Micro Devices, Inc.
Operating System Research Center
email: robert.richter@...

[Ralf Baechle DL5RB]

On Wed, Oct 21, 2009 at 06:59:07PM +0200, Robert Richter wrote:

> On 21.10.09 22:51:46, Wu Zhangjin wrote:
> > This patch try to unify the naming method between kernel and the
> > user-space oprofile tool. 'Cause loongson is used instead of godson in
> > most of the places, and just confer with the developer of the user-space
> > tool, we are agreed to use loongson instead, which will help a lot to
> > the future maintaining.
> >
> > (This patch is very important to help the user-space support upstream,
> >  so, Ralf, could you please merge it into your -queue branch, thanks!)

Applied to master, not queue.  The name is part of an API, so cosmetic
changes like this are to be avoided.  Fortunately the oprofile code in
question is still fairly new, hasn't been art of any stable kernel
release yet so it better go into the kernel now than later.

> > Signed-off-by: Wu Zhangjin <wuzhangjin@...>
>
> Acked-by: Robert Richter <robert.richter@...>
>
> Ralf, please apply to your tree.

  Ralf