diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2009-11-13 18:26:34 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2009-11-13 18:35:52 -0500 |
commit | a362c638bdf052bf424bce7645d39b101090f6ba (patch) | |
tree | 9622bd946d6f21071611415530a7ce736144a9ff /kernel/time | |
parent | 97813f2fe77804a4464564c75ba8d8826377feea (diff) |
clocksource/events: Fix fallout of generic code changes
powerpc grew a new warning due to the type change of clockevent->mult.
The architectures which use parts of the generic time keeping
infrastructure tripped over my wrong assumption that
clocksource_register is only used when GENERIC_TIME=y.
I should have looked and also I should have known better. These
renitent Gaul villages are racking my nerves. Some serious deprecating
is due.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/time')
-rw-r--r-- | kernel/time/clocksource.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c index b65b242f04dd..72a2dcbd8b48 100644 --- a/kernel/time/clocksource.c +++ b/kernel/time/clocksource.c | |||
@@ -466,8 +466,6 @@ void clocksource_touch_watchdog(void) | |||
466 | clocksource_resume_watchdog(); | 466 | clocksource_resume_watchdog(); |
467 | } | 467 | } |
468 | 468 | ||
469 | #ifdef CONFIG_GENERIC_TIME | ||
470 | |||
471 | /** | 469 | /** |
472 | * clocksource_max_deferment - Returns max time the clocksource can be deferred | 470 | * clocksource_max_deferment - Returns max time the clocksource can be deferred |
473 | * @cs: Pointer to clocksource | 471 | * @cs: Pointer to clocksource |
@@ -509,6 +507,8 @@ static u64 clocksource_max_deferment(struct clocksource *cs) | |||
509 | return max_nsecs - (max_nsecs >> 5); | 507 | return max_nsecs - (max_nsecs >> 5); |
510 | } | 508 | } |
511 | 509 | ||
510 | #ifdef CONFIG_GENERIC_TIME | ||
511 | |||
512 | /** | 512 | /** |
513 | * clocksource_select - Select the best clocksource available | 513 | * clocksource_select - Select the best clocksource available |
514 | * | 514 | * |