From ce1795676a9b539e4bcca3df2945fcec9ee8516f Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Fri, 3 Oct 2008 11:39:46 +0200
Subject: [PATCH] --- yaml --- r: 115205 b: refs/heads/master c:
 77af7e3403e7314c47b0c07fbc5e4ef21d939532 h: refs/heads/master i:   115203:
 cd2632892fc8e7d74d9a48b485cdb50c2b8c262c v: v3

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

diff --git a/[refs] b/[refs]
index ae047dd1ff91..e078637aaa2d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e85b4b553fc932e1c5141feb5fda389b7f5db01
+refs/heads/master: 77af7e3403e7314c47b0c07fbc5e4ef21d939532
diff --git a/trunk/kernel/softirq.c b/trunk/kernel/softirq.c
index 1cf1e2f2c406..be7a8292f992 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 sotfirq %ld %p"
+				printk(KERN_ERR "huh, entered softirq %d %p"
 				       "with preempt_count %08x,"
 				       " exited with %08x?\n", h - softirq_vec,
 				       h->action, prev_count, preempt_count());