The patch titled
Subject: timer_list-convert-timer-list-to-be-a-proper-seq_file-fix-fix
has been removed from the -mm tree. Its filename was
timer_list-convert-timer-list-to-be-a-proper-seq_file-fix-fix.patch
This patch was dropped because it was folded into timer_list-convert-timer-list-to-be-a-proper-seq_file.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: 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@xxxxxxxxxx>
Cc: John Stultz <johnstul@xxxxxxxxxx>
Cc: Nathan Zimmer <nzimmer@xxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/time/timer_list.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff -puN kernel/time/timer_list.c~timer_list-convert-timer-list-to-be-a-proper-seq_file-fix-fix kernel/time/timer_list.c
--- a/kernel/time/timer_list.c~timer_list-convert-timer-list-to-be-a-proper-seq_file-fix-fix
+++ a/kernel/time/timer_list.c
@@ -259,12 +259,12 @@ static int timer_list_show(struct seq_fi
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
#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);
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
origin.patch
bugh-prevent-double-evaulation-of-in-build_bug_on-fix.patch
bugh-compilerh-introduce-compiletime_assert-build_bug_on_msg-checkpatch-fixes.patch
goldfish-framebuffer-driver-fix.patch
timer_list-convert-timer-list-to-be-a-proper-seq_file.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
