aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-16 15:32:46 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-16 15:32:46 -0700
commit1c95e1b69073cff5ff179e592fa1a1e182c78a17 (patch)
tree3fc9d1f665f66beb24d66b3ea65d2b5fdd7a1878
parente533b227055598b1f7dc8503a3b4f36b14b9da8a (diff)
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>
-rw-r--r--kernel/softirq.c2
1 files changed, 1 insertions, 1 deletions
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());