Skip to content

Commit

Permalink
clocksource/events: Fix fallout of generic code changes
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Thomas Gleixner committed Nov 13, 2009
1 parent 97813f2 commit a362c63
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion arch/powerpc/kernel/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -905,7 +905,7 @@ static void register_decrementer_clockevent(int cpu)
*dec = decrementer_clockevent;
dec->cpumask = cpumask_of(cpu);

printk(KERN_DEBUG "clockevent: %s mult[%lx] shift[%d] cpu[%d]\n",
printk(KERN_DEBUG "clockevent: %s mult[%x] shift[%d] cpu[%d]\n",
dec->name, dec->mult, dec->shift, cpu);

clockevents_register_device(dec);
Expand Down
4 changes: 2 additions & 2 deletions kernel/time/clocksource.c
Original file line number Diff line number Diff line change
Expand Up @@ -466,8 +466,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
Expand Down Expand Up @@ -509,6 +507,8 @@ static u64 clocksource_max_deferment(struct clocksource *cs)
return max_nsecs - (max_nsecs >> 5);
}

#ifdef CONFIG_GENERIC_TIME

/**
* clocksource_select - Select the best clocksource available
*
Expand Down

0 comments on commit a362c63

Please sign in to comment.