Skip to content

Commit

Permalink
ARM: picoxcell: fix sched_clock() cleanup fallout
Browse files Browse the repository at this point in the history
Commit 2f0778a (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>
  • Loading branch information
Jamie Iles committed Jan 9, 2012
1 parent ef3a0bf commit 6b2a055
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/arm/mach-picoxcell/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

0 comments on commit 6b2a055

Please sign in to comment.