clocksource: fixup ux500 build problems

Based on a patch from Arnd Bergmann this fixes up the build
problem of assigning a non-existing global when the ux500 PRCMU
timer is not linked in by passing its base address to the init
function. We also add a missing <linux/errno.h> inclusion and
staticize the dummy function.

Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij
2011-10-03 09:30:20 +02:00
parent bb219dba0d
commit b1e3be0647
3 changed files with 12 additions and 9 deletions

View File

@@ -31,7 +31,7 @@
#define SCHED_CLOCK_MIN_WRAP 131072 /* 2^32 / 32768 */
void __iomem *clksrc_dbx500_timer_base;
static void __iomem *clksrc_dbx500_timer_base;
static cycle_t clksrc_dbx500_prcmu_read(struct clocksource *cs)
{
@@ -79,8 +79,10 @@ static void notrace clksrc_dbx500_prcmu_update_sched_clock(void)
}
#endif
void __init clksrc_dbx500_prcmu_init(void)
void __init clksrc_dbx500_prcmu_init(void __iomem *base)
{
clksrc_dbx500_timer_base = base;
/*
* The A9 sub system expects the timer to be configured as
* a continous looping timer.