summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2009-11-14 00:26:34 +0100
committerThomas Gleixner <tglx@linutronix.de>2009-11-14 00:35:52 +0100
commita362c638bdf052bf424bce7645d39b101090f6ba (patch)
tree9622bd946d6f21071611415530a7ce736144a9ff /arch
parent97813f2fe77804a4464564c75ba8d8826377feea (diff)
downloadblackbird-op-linux-a362c638bdf052bf424bce7645d39b101090f6ba.tar.gz
blackbird-op-linux-a362c638bdf052bf424bce7645d39b101090f6ba.zip
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 'arch')
-rw-r--r--arch/powerpc/kernel/time.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 92dc844299b6..60ceb2708948 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -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);
OpenPOWER on IntegriCloud