From 647ff8e7e7dcb2db61d90178b1c429e1f64e453a Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Fri, 9 Oct 2009 12:41:30 +0200
Subject: [PATCH] --- yaml --- r: 167208 b: refs/heads/master c:
 cc9b0b9bea9a0057840261204a6e01c7e19d444c h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/include/asm-generic/hardirq.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 157b06f96e6b..b7054776c953 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: baf4974e496957681403d4bf74a3274ed3f85277
+refs/heads/master: cc9b0b9bea9a0057840261204a6e01c7e19d444c
diff --git a/trunk/include/asm-generic/hardirq.h b/trunk/include/asm-generic/hardirq.h
index 23bb4dad4962..62f59080e5cc 100644
--- a/trunk/include/asm-generic/hardirq.h
+++ b/trunk/include/asm-generic/hardirq.h
@@ -6,7 +6,7 @@
 #include <linux/irq.h>
 
 typedef struct {
-	unsigned long __softirq_pending;
+	unsigned int __softirq_pending;
 } ____cacheline_aligned irq_cpustat_t;
 
 #include <linux/irq_cpustat.h>	/* Standard mappings for irq_cpustat_t above */