From: Jamie Iles <jamie@jamieiles.com>
Date: Mon, 9 Jan 2012 18:10:56 +0000 (+0000)
Subject: ARM: picoxcell: fix sched_clock() cleanup fallout
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6b2a05584c5939eba24d22037dcb4cc71e5345e5;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

ARM: picoxcell: fix sched_clock() cleanup fallout

Commit 2f0778afa (ARM: 7205/2: sched_clock: allow sched_clock to be
selected at runtime) replaced the picoxcell specific sched_clock() with
a generic runtime selectable version but replaced "unsigned long long
notrace sched_clock(void)" with "unsigned u32 notrace
picoxcell_read_sched_clock(void)" fix this up to return a u32 as
expected.

Cc: Marc Zyngier <Marc.Zyngier@arm.com>
Signed-off-by: Jamie Iles <jamie@jamieiles.com>
---

diff --git a/arch/arm/mach-picoxcell/time.c b/arch/arm/mach-picoxcell/time.c
index 6c89cf8ab22e..2ecba6743b8e 100644
--- a/arch/arm/mach-picoxcell/time.c
+++ b/arch/arm/mach-picoxcell/time.c
@@ -67,7 +67,7 @@ static void picoxcell_add_clocksource(struct device_node *source_timer)
 
 static void __iomem *sched_io_base;
 
-unsigned u32 notrace picoxcell_read_sched_clock(void)
+static u32 picoxcell_read_sched_clock(void)
 {
 	return __raw_readl(sched_io_base);
 }