diff options
author | David Miller <davem@davemloft.net> | 2007-05-09 05:33:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 15:30:50 -0400 |
commit | 9b04bd27564cfd7224e0135ba37df778f1d490bf (patch) | |
tree | fd62f8c1fe7f17a9e92796412c1657b83ebe3965 | |
parent | 0366299bd2de283091f4394c0f446e58b5f94815 (diff) |
Fix printk format warnings in timer_list.c
u64 and s64 are not necessarily 'long long' on some 64-bit
platforms, so explicit the type to kill the compiler warnings.
Also consistently use '%Lu' which is unsigned.
Signed-off-by: David S. Miller <davem@davemloft.net>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | kernel/time/timer_list.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c index b734ca4bc75e..8bbcfb77f7d2 100644 --- a/kernel/time/timer_list.c +++ b/kernel/time/timer_list.c | |||
@@ -65,7 +65,7 @@ print_timer(struct seq_file *m, struct hrtimer *timer, int idx, u64 now) | |||
65 | SEQ_printf(m, ", %s/%d", tmp, timer->start_pid); | 65 | SEQ_printf(m, ", %s/%d", tmp, timer->start_pid); |
66 | #endif | 66 | #endif |
67 | SEQ_printf(m, "\n"); | 67 | SEQ_printf(m, "\n"); |
68 | SEQ_printf(m, " # expires at %Ld nsecs [in %Ld nsecs]\n", | 68 | SEQ_printf(m, " # expires at %Lu nsecs [in %Lu nsecs]\n", |
69 | (unsigned long long)ktime_to_ns(timer->expires), | 69 | (unsigned long long)ktime_to_ns(timer->expires), |
70 | (unsigned long long)(ktime_to_ns(timer->expires) - now)); | 70 | (unsigned long long)(ktime_to_ns(timer->expires) - now)); |
71 | } | 71 | } |
@@ -111,14 +111,14 @@ print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now) | |||
111 | { | 111 | { |
112 | SEQ_printf(m, " .index: %d\n", | 112 | SEQ_printf(m, " .index: %d\n", |
113 | base->index); | 113 | base->index); |
114 | SEQ_printf(m, " .resolution: %Ld nsecs\n", | 114 | SEQ_printf(m, " .resolution: %Lu nsecs\n", |
115 | (unsigned long long)ktime_to_ns(base->resolution)); | 115 | (unsigned long long)ktime_to_ns(base->resolution)); |
116 | SEQ_printf(m, " .get_time: "); | 116 | SEQ_printf(m, " .get_time: "); |
117 | print_name_offset(m, base->get_time); | 117 | print_name_offset(m, base->get_time); |
118 | SEQ_printf(m, "\n"); | 118 | SEQ_printf(m, "\n"); |
119 | #ifdef CONFIG_HIGH_RES_TIMERS | 119 | #ifdef CONFIG_HIGH_RES_TIMERS |
120 | SEQ_printf(m, " .offset: %Ld nsecs\n", | 120 | SEQ_printf(m, " .offset: %Lu nsecs\n", |
121 | ktime_to_ns(base->offset)); | 121 | (unsigned long long) ktime_to_ns(base->offset)); |
122 | #endif | 122 | #endif |
123 | SEQ_printf(m, "active timers:\n"); | 123 | SEQ_printf(m, "active timers:\n"); |
124 | print_active_timers(m, base, now); | 124 | print_active_timers(m, base, now); |
@@ -135,10 +135,11 @@ static void print_cpu(struct seq_file *m, int cpu, u64 now) | |||
135 | print_base(m, cpu_base->clock_base + i, now); | 135 | print_base(m, cpu_base->clock_base + i, now); |
136 | } | 136 | } |
137 | #define P(x) \ | 137 | #define P(x) \ |
138 | SEQ_printf(m, " .%-15s: %Ld\n", #x, (u64)(cpu_base->x)) | 138 | SEQ_printf(m, " .%-15s: %Lu\n", #x, \ |
139 | (unsigned long long)(cpu_base->x)) | ||
139 | #define P_ns(x) \ | 140 | #define P_ns(x) \ |
140 | SEQ_printf(m, " .%-15s: %Ld nsecs\n", #x, \ | 141 | SEQ_printf(m, " .%-15s: %Lu nsecs\n", #x, \ |
141 | (u64)(ktime_to_ns(cpu_base->x))) | 142 | (unsigned long long)(ktime_to_ns(cpu_base->x))) |
142 | 143 | ||
143 | #ifdef CONFIG_HIGH_RES_TIMERS | 144 | #ifdef CONFIG_HIGH_RES_TIMERS |
144 | P_ns(expires_next); | 145 | P_ns(expires_next); |
@@ -150,10 +151,11 @@ static void print_cpu(struct seq_file *m, int cpu, u64 now) | |||
150 | 151 | ||
151 | #ifdef CONFIG_TICK_ONESHOT | 152 | #ifdef CONFIG_TICK_ONESHOT |
152 | # define P(x) \ | 153 | # define P(x) \ |
153 | SEQ_printf(m, " .%-15s: %Ld\n", #x, (u64)(ts->x)) | 154 | SEQ_printf(m, " .%-15s: %Lu\n", #x, \ |
155 | (unsigned long long)(ts->x)) | ||
154 | # define P_ns(x) \ | 156 | # define P_ns(x) \ |
155 | SEQ_printf(m, " .%-15s: %Ld nsecs\n", #x, \ | 157 | SEQ_printf(m, " .%-15s: %Lu nsecs\n", #x, \ |
156 | (u64)(ktime_to_ns(ts->x))) | 158 | (unsigned long long)(ktime_to_ns(ts->x))) |
157 | { | 159 | { |
158 | struct tick_sched *ts = tick_get_tick_sched(cpu); | 160 | struct tick_sched *ts = tick_get_tick_sched(cpu); |
159 | P(nohz_mode); | 161 | P(nohz_mode); |
@@ -167,7 +169,8 @@ static void print_cpu(struct seq_file *m, int cpu, u64 now) | |||
167 | P(last_jiffies); | 169 | P(last_jiffies); |
168 | P(next_jiffies); | 170 | P(next_jiffies); |
169 | P_ns(idle_expires); | 171 | P_ns(idle_expires); |
170 | SEQ_printf(m, "jiffies: %Ld\n", (u64)jiffies); | 172 | SEQ_printf(m, "jiffies: %Lu\n", |
173 | (unsigned long long)jiffies); | ||
171 | } | 174 | } |
172 | #endif | 175 | #endif |
173 | 176 | ||