summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2013-02-07 12:25:58 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2013-02-14 15:25:01 +1100
commit48d18d5e47270f6b7791cf62d4a2181f06030f7c (patch)
tree2837308ad3059731c5bf4ce6b2fcbf3485d9f996 /kernel
parent5a5b89dbe2f6fe48451d30ecdc9c871d70c1d489 (diff)
timer_list-convert-timer-list-to-be-a-proper-seq_file-fix-fix
kernel/time/timer_list.c: In function 'timer_list_show': kernel/time/timer_list.c:262: warning: cast to pointer from integer of different size kernel/time/timer_list.c:267: warning: cast to pointer from integer of different size kernel/time/timer_list.c: In function 'timer_list_start': kernel/time/timer_list.c:297: warning: cast to pointer from integer of different size This code is revolting :( Cc: Dave Jones <davej@redhat.com> Cc: John Stultz <johnstul@us.ibm.com> Cc: Nathan Zimmer <nzimmer@sgi.com> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/time/timer_list.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
index a5f74f68b7d3..9904e4880d04 100644
--- a/kernel/time/timer_list.c
+++ b/kernel/time/timer_list.c
@@ -259,12 +259,12 @@ static int timer_list_show(struct seq_file *m, void *v)
HRTIMER_MAX_CLOCK_BASES);
SEQ_printf(m, "now at %Ld nsecs\n", (unsigned long long)now);
SEQ_printf(m, "\n");
- } else if (v < (void *)(nr_cpu_ids + 2)) {
+ } else if (v < (void *)(unsigned long)(nr_cpu_ids + 2)) {
cpu = (unsigned long)(v - 2);
print_cpu(m, cpu, now);
}
#ifdef CONFIG_GENERIC_CLOCKEVENTS
- else if (v == (void *)nr_cpu_ids + 2) {
+ else if (v == (void *)(unsigned long)nr_cpu_ids + 2) {
timer_list_show_tickdevices_header(m);
} else {
cpu = (unsigned long)(v - 3 - nr_cpu_ids);
@@ -306,7 +306,7 @@ static void *timer_list_start(struct seq_file *file, loff_t *offset)
#ifdef CONFIG_GENERIC_CLOCKEVENTS
if (n == nr_cpu_ids + 1)
- return (void *) (nr_cpu_ids + 2);
+ return (void *)(unsigned long)(nr_cpu_ids + 2);
if (n < nr_cpu_ids * 2 + 2) {
n -= (nr_cpu_ids + 2);