diff options
| author |   Jamie Iles <jamie@jamieiles.com> | 2012-01-09 18:10:56 +0000 |
|---|---|---|
| committer | Jamie Iles <jamie@jamieiles.com> | 2012-01-09 21:04:44 +0000 |
| commit | 6b2a05584c5939eba24d22037dcb4cc71e5345e5 (patch) | |
| tree | 3b72a89c5fe93f6d6fe635b71716be137f07d49b /arch/arm/mach-picoxcell | |
| parent | ARM: 7269/1: mach-sa1100: fix sched_clock breakage (diff) | |
| download | linux-dev-6b2a05584c5939eba24d22037dcb4cc71e5345e5.tar.xz linux-dev-6b2a05584c5939eba24d22037dcb4cc71e5345e5.zip | |
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>
Diffstat (limited to 'arch/arm/mach-picoxcell')
| -rw-r--r-- | arch/arm/mach-picoxcell/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); } |