| From aaro.koskinen@iki.fi Mon Feb 1 13:24:31 2010 |
| From: Aaro Koskinen <aaro.koskinen@iki.fi> |
| Date: Mon, 1 Feb 2010 18:24:58 +0200 |
| Subject: clocksource: fix compilation if no GENERIC_TIME |
| To: stable@kernel.org, gregkh@suse.de, tglx@linutronix.de, linux-kernel@vger.kernel.org |
| Message-ID: <1265041498-2434-1-git-send-email-aaro.koskinen@iki.fi> |
| |
| From: Aaro Koskinen <aaro.koskinen@iki.fi> |
| |
| commit a362c638bdf052bf424bce7645d39b101090f6ba upstream |
| |
| Commit a9238ce3bb0fda6e760780b702c6cbd3793087d3 broke compilation on |
| platforms that do not implement GENERIC_TIME (e.g. iop32x): |
| |
| kernel/time/clocksource.c: In function 'clocksource_register': |
| kernel/time/clocksource.c:556: error: implicit declaration of function 'clocksource_max_deferment' |
| |
| Provide the implementation of clocksource_max_deferment() also for |
| such platforms. |
| |
| Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> |
| Cc: Thomas Gleixner <tglx@linutronix.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| kernel/time/clocksource.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/kernel/time/clocksource.c |
| +++ b/kernel/time/clocksource.c |
| @@ -413,8 +413,6 @@ void clocksource_touch_watchdog(void) |
| clocksource_resume_watchdog(); |
| } |
| |
| -#ifdef CONFIG_GENERIC_TIME |
| - |
| /** |
| * clocksource_max_deferment - Returns max time the clocksource can be deferred |
| * @cs: Pointer to clocksource |
| @@ -456,6 +454,8 @@ static u64 clocksource_max_deferment(str |
| return max_nsecs - (max_nsecs >> 5); |
| } |
| |
| +#ifdef CONFIG_GENERIC_TIME |
| + |
| /** |
| * clocksource_select - Select the best clocksource available |
| * |
