summaryrefslogtreecommitdiffstats
path: root/arch/sparc
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-12-11 11:05:05 +0100
committerDavid S. Miller <davem@davemloft.net>2009-12-11 11:05:05 +0100
commit7466bd3caab6bd1d0095de957affbacd02ca58a7 (patch)
tree7d61305c1595e8c7de6304a1b33b5849638f3407 /arch/sparc
parentsparc64: Use clock{source,events}_calc_mult_shift(). (diff)
downloadlinux-7466bd3caab6bd1d0095de957affbacd02ca58a7.tar.xz
linux-7466bd3caab6bd1d0095de957affbacd02ca58a7.zip
sparc64: Fix clock event multiplier printf format.
The type got changed to u32, so %lx generated warnings (and thus build failure on sparc64) Stephen Rothwell fixed it like so: - printk("clockevent: mult[%lx] shift[%d]\n", + printk("clockevent: mult[%ux] shift[%d]\n", But that's not a valid transformation, we now get: clockevent: mult[51539607x] shift[32] in the logs. Fix it to use the correct plain "%x" instead. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc')
-rw-r--r--arch/sparc/kernel/time_64.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/time_64.c b/arch/sparc/kernel/time_64.c
index c310875c9281..67e165102885 100644
--- a/arch/sparc/kernel/time_64.c
+++ b/arch/sparc/kernel/time_64.c
@@ -827,7 +827,7 @@ void __init time_init(void)
sparc64_clockevent.min_delta_ns =
clockevent_delta2ns(0xF, &sparc64_clockevent);
- printk("clockevent: mult[%ux] shift[%d]\n",
+ printk("clockevent: mult[%x] shift[%d]\n",
sparc64_clockevent.mult, sparc64_clockevent.shift);
setup_sparc64_timer();