linux-mips.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 3/3] Fix typo "enalbe" -> "enable"
@ 2009-09-21  8:40 Uwe Kleine-König
  2009-09-23  7:38 ` Wu Zhangjin
  2009-09-23  9:19 ` Ralf Baechle
  0 siblings, 2 replies; 3+ messages in thread
From: Uwe Kleine-König @ 2009-09-21  8:40 UTC (permalink / raw)
  To: linux-mips, oprofile-list
  Cc: Wu Zhangjin, Yanhua, Ralf Baechle, Robert Richter

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Wu Zhangjin <wuzj@lemote.com>
Cc: Yanhua <yanh@lemote.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Robert Richter <robert.richter@amd.com>
---
 arch/mips/oprofile/op_model_loongson2.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/mips/oprofile/op_model_loongson2.c b/arch/mips/oprofile/op_model_loongson2.c
index 655cb8d..deed1d5 100644
--- a/arch/mips/oprofile/op_model_loongson2.c
+++ b/arch/mips/oprofile/op_model_loongson2.c
@@ -44,7 +44,7 @@ static struct loongson2_register_config {
 	unsigned int ctrl;
 	unsigned long long reset_counter1;
 	unsigned long long reset_counter2;
-	int cnt1_enalbed, cnt2_enalbed;
+	int cnt1_enabled, cnt2_enabled;
 } reg;
 
 DEFINE_SPINLOCK(sample_lock);
@@ -81,8 +81,8 @@ static void loongson2_reg_setup(struct op_counter_config *cfg)
 
 	reg.ctrl = ctrl;
 
-	reg.cnt1_enalbed = cfg[0].enabled;
-	reg.cnt2_enalbed = cfg[1].enabled;
+	reg.cnt1_enabled = cfg[0].enabled;
+	reg.cnt2_enabled = cfg[1].enabled;
 
 }
 
@@ -99,7 +99,7 @@ static void loongson2_cpu_setup(void *args)
 static void loongson2_cpu_start(void *args)
 {
 	/* Start all counters on current CPU */
-	if (reg.cnt1_enalbed || reg.cnt2_enalbed)
+	if (reg.cnt1_enabled || reg.cnt2_enabled)
 		write_c0_perfctrl(reg.ctrl);
 }
 
@@ -125,7 +125,7 @@ static irqreturn_t loongson2_perfcount_handler(int irq, void *dev_id)
 	 */
 
 	/* Check whether the irq belongs to me */
-	enabled = reg.cnt1_enalbed | reg.cnt2_enalbed;
+	enabled = reg.cnt1_enabled | reg.cnt2_enabled;
 	if (!enabled)
 		return IRQ_NONE;
 
@@ -136,12 +136,12 @@ static irqreturn_t loongson2_perfcount_handler(int irq, void *dev_id)
 	spin_lock_irqsave(&sample_lock, flags);
 
 	if (counter1 & LOONGSON2_PERFCNT_OVERFLOW) {
-		if (reg.cnt1_enalbed)
+		if (reg.cnt1_enabled)
 			oprofile_add_sample(regs, 0);
 		counter1 = reg.reset_counter1;
 	}
 	if (counter2 & LOONGSON2_PERFCNT_OVERFLOW) {
-		if (reg.cnt2_enalbed)
+		if (reg.cnt2_enabled)
 			oprofile_add_sample(regs, 1);
 		counter2 = reg.reset_counter2;
 	}
-- 
1.6.4.3

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH 3/3] Fix typo "enalbe" -> "enable"
  2009-09-21  8:40 [PATCH 3/3] Fix typo "enalbe" -> "enable" Uwe Kleine-König
@ 2009-09-23  7:38 ` Wu Zhangjin
  2009-09-23  9:19 ` Ralf Baechle
  1 sibling, 0 replies; 3+ messages in thread
From: Wu Zhangjin @ 2009-09-23  7:38 UTC (permalink / raw)
  To: Uwe Kleine-König
  Cc: linux-mips, oprofile-list, Yanhua, Ralf Baechle, Robert Richter

On Mon, 2009-09-21 at 10:40 +0200, Uwe Kleine-König wrote:
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> Cc: Wu Zhangjin <wuzj@lemote.com>
> Cc: Yanhua <yanh@lemote.com>
> Cc: Ralf Baechle <ralf@linux-mips.org>
> Cc: Robert Richter <robert.richter@amd.com>
> ---
>  arch/mips/oprofile/op_model_loongson2.c |   14 +++++++-------
>  1 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/arch/mips/oprofile/op_model_loongson2.c b/arch/mips/oprofile/op_model_loongson2.c
> index 655cb8d..deed1d5 100644
> --- a/arch/mips/oprofile/op_model_loongson2.c
> +++ b/arch/mips/oprofile/op_model_loongson2.c
> @@ -44,7 +44,7 @@ static struct loongson2_register_config {
>  	unsigned int ctrl;
>  	unsigned long long reset_counter1;
>  	unsigned long long reset_counter2;
> -	int cnt1_enalbed, cnt2_enalbed;
> +	int cnt1_enabled, cnt2_enabled;
>  } reg;
>  
>  DEFINE_SPINLOCK(sample_lock);
> @@ -81,8 +81,8 @@ static void loongson2_reg_setup(struct op_counter_config *cfg)
>  
>  	reg.ctrl = ctrl;
>  
> -	reg.cnt1_enalbed = cfg[0].enabled;
> -	reg.cnt2_enalbed = cfg[1].enabled;
> +	reg.cnt1_enabled = cfg[0].enabled;
> +	reg.cnt2_enabled = cfg[1].enabled;
>  
>  }
>  
> @@ -99,7 +99,7 @@ static void loongson2_cpu_setup(void *args)
>  static void loongson2_cpu_start(void *args)
>  {
>  	/* Start all counters on current CPU */
> -	if (reg.cnt1_enalbed || reg.cnt2_enalbed)
> +	if (reg.cnt1_enabled || reg.cnt2_enabled)
>  		write_c0_perfctrl(reg.ctrl);
>  }
>  
> @@ -125,7 +125,7 @@ static irqreturn_t loongson2_perfcount_handler(int irq, void *dev_id)
>  	 */
>  
>  	/* Check whether the irq belongs to me */
> -	enabled = reg.cnt1_enalbed | reg.cnt2_enalbed;
> +	enabled = reg.cnt1_enabled | reg.cnt2_enabled;
>  	if (!enabled)
>  		return IRQ_NONE;
>  
> @@ -136,12 +136,12 @@ static irqreturn_t loongson2_perfcount_handler(int irq, void *dev_id)
>  	spin_lock_irqsave(&sample_lock, flags);
>  
>  	if (counter1 & LOONGSON2_PERFCNT_OVERFLOW) {
> -		if (reg.cnt1_enalbed)
> +		if (reg.cnt1_enabled)
>  			oprofile_add_sample(regs, 0);
>  		counter1 = reg.reset_counter1;
>  	}
>  	if (counter2 & LOONGSON2_PERFCNT_OVERFLOW) {
> -		if (reg.cnt2_enalbed)
> +		if (reg.cnt2_enabled)
>  			oprofile_add_sample(regs, 1);
>  		counter2 = reg.reset_counter2;
>  	}

Acked, thanks!

Regards,
	Wu Zhangjin

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH 3/3] Fix typo "enalbe" -> "enable"
  2009-09-21  8:40 [PATCH 3/3] Fix typo "enalbe" -> "enable" Uwe Kleine-König
  2009-09-23  7:38 ` Wu Zhangjin
@ 2009-09-23  9:19 ` Ralf Baechle
  1 sibling, 0 replies; 3+ messages in thread
From: Ralf Baechle @ 2009-09-23  9:19 UTC (permalink / raw)
  To: Uwe Kleine-König
  Cc: linux-mips, oprofile-list, Wu Zhangjin, Yanhua, Robert Richter

On Mon, Sep 21, 2009 at 10:40:37AM +0200, Uwe Kleine-König wrote:

Thanks, applied!

  Ralf

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2009-09-23  9:18 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-09-21  8:40 [PATCH 3/3] Fix typo "enalbe" -> "enable" Uwe Kleine-König
2009-09-23  7:38 ` Wu Zhangjin
2009-09-23  9:19 ` Ralf Baechle

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).