From 3d85d95133ced6e309e53a123cce17814b732d60 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 16 Oct 2008 15:32:46 -0700
Subject: [PATCH] --- yaml --- r: 115222 b: refs/heads/master c:
 1c95e1b69073cff5ff179e592fa1a1e182c78a17 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/kernel/softirq.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fd5b8781c172..85a6e9e0c734 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e533b227055598b1f7dc8503a3b4f36b14b9da8a
+refs/heads/master: 1c95e1b69073cff5ff179e592fa1a1e182c78a17
diff --git a/trunk/kernel/softirq.c b/trunk/kernel/softirq.c
index be7a8292f992..37d67aa2d56f 100644
--- a/trunk/kernel/softirq.c
+++ b/trunk/kernel/softirq.c
@@ -210,7 +210,7 @@ asmlinkage void __do_softirq(void)
 			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());