From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 16 Oct 2008 22:32:46 +0000 (-0700)
Subject: Fix kernel/softirq.c printk format warning properly
X-Git-Tag: v2.6.28-rc1~270
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1c95e1b69073cff5ff179e592fa1a1e182c78a17;p=linux-2.6-omap-h63xx.git

Fix kernel/softirq.c printk format warning properly

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>
---

diff --git a/kernel/softirq.c b/kernel/softirq.c
index be7a8292f99..37d67aa2d56 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -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());