* [PATCH 1/2] mach-sa1100: fix sched_clock breakage
@ 2012-01-04 10:21 Linus Walleij
2012-01-04 10:36 ` Marc Zyngier
2012-01-04 19:21 ` Kristoffer Ericson
0 siblings, 2 replies; 3+ messages in thread
From: Linus Walleij @ 2012-01-04 10:21 UTC (permalink / raw)
To: linux-arm-kernel
Fixed up a simple typo in the runtime sched_clock conversion
so we compile again.
Cc: Kristoffer Ericson <kristoffer.ericson@gmail.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
arch/arm/mach-sa1100/time.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-sa1100/time.c b/arch/arm/mach-sa1100/time.c
index 1ee6d4c..69e3353 100644
--- a/arch/arm/mach-sa1100/time.c
+++ b/arch/arm/mach-sa1100/time.c
@@ -19,7 +19,7 @@
#include <asm/sched_clock.h>
#include <mach/hardware.h>
-static u32 notrace sa100_read_sched_clock(void)
+static u32 notrace sa1100_read_sched_clock(void)
{
return OSCR;
}
--
1.7.6.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 1/2] mach-sa1100: fix sched_clock breakage
2012-01-04 10:21 [PATCH 1/2] mach-sa1100: fix sched_clock breakage Linus Walleij
@ 2012-01-04 10:36 ` Marc Zyngier
2012-01-04 19:21 ` Kristoffer Ericson
1 sibling, 0 replies; 3+ messages in thread
From: Marc Zyngier @ 2012-01-04 10:36 UTC (permalink / raw)
To: linux-arm-kernel
On 04/01/12 10:21, Linus Walleij wrote:
> Fixed up a simple typo in the runtime sched_clock conversion
> so we compile again.
>
> Cc: Kristoffer Ericson <kristoffer.ericson@gmail.com>
> Cc: Marc Zyngier <marc.zyngier@arm.com>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Thanks Linus for fixing this.
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
M.
--
Jazz is not dead. It just smells funny...
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/2] mach-sa1100: fix sched_clock breakage
2012-01-04 10:21 [PATCH 1/2] mach-sa1100: fix sched_clock breakage Linus Walleij
2012-01-04 10:36 ` Marc Zyngier
@ 2012-01-04 19:21 ` Kristoffer Ericson
1 sibling, 0 replies; 3+ messages in thread
From: Kristoffer Ericson @ 2012-01-04 19:21 UTC (permalink / raw)
To: linux-arm-kernel
Thx :)
Acked-by: Kristoffer Ericson <kristoffer.ericson@gmail.com>
On Wed, Jan 04, 2012 at 11:21:43AM +0100, Linus Walleij wrote:
> Fixed up a simple typo in the runtime sched_clock conversion
> so we compile again.
>
> Cc: Kristoffer Ericson <kristoffer.ericson@gmail.com>
> Cc: Marc Zyngier <marc.zyngier@arm.com>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> arch/arm/mach-sa1100/time.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-sa1100/time.c b/arch/arm/mach-sa1100/time.c
> index 1ee6d4c..69e3353 100644
> --- a/arch/arm/mach-sa1100/time.c
> +++ b/arch/arm/mach-sa1100/time.c
> @@ -19,7 +19,7 @@
> #include <asm/sched_clock.h>
> #include <mach/hardware.h>
>
> -static u32 notrace sa100_read_sched_clock(void)
> +static u32 notrace sa1100_read_sched_clock(void)
> {
> return OSCR;
> }
> --
> 1.7.6.4
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-01-04 19:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-04 10:21 [PATCH 1/2] mach-sa1100: fix sched_clock breakage Linus Walleij
2012-01-04 10:36 ` Marc Zyngier
2012-01-04 19:21 ` Kristoffer Ericson
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).