Fix kernel/softirq.c printk format warning properly
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Oct 2008 22:32:46 +0000 (15:32 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Oct 2008 22:32:46 +0000 (15:32 -0700)
This fixes the broken 77af7e3403e7314c47b0c07fbc5e4ef21d939532
("softirq, warning fix: correct a format to avoid a warning") fix
correctly.

The type of a pointer subtraction is not "int", nor is it "long".  It
can be either (or something else).  It's "ptrdiff_t", and the printk
format for it is "%td".

Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
kernel/softirq.c

index be7a8292f992ce37ddc9d991abcacf6980a2b546..37d67aa2d56fb18cb189f13e6a727ae3570c546e 100644 (file)
@@ -210,7 +210,7 @@ restart:
                        h->action(h);
 
                        if (unlikely(prev_count != preempt_count())) {
-                               printk(KERN_ERR "huh, entered softirq %d %p"
+                               printk(KERN_ERR "huh, entered softirq %td %p"
                                       "with preempt_count %08x,"
                                       " exited with %08x?\n", h - softirq_vec,
                                       h->action, prev_count, preempt_count());