From 5f701793f63f16d111db3e3d2e91134fcc179c5b Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed, 14 Mar 2012 01:27:56 +0100
Subject: Fix variable types according to assembly use

* linux/dev/arch/i386/kernel/irq.c (intr_count): Set to int type.
* linux/dev/kernel/softirq.c (bh_active, bh_mask): Likewise.
(linux_soft_intr: active, mask, left): Likewise
* linux/src/include/linux/interrupt.h (bh_active, bh_mask): Likewise.
* linux/src/kernel/softirq.c (intr_count, bh_active, bh_mask): Likewise.
(do_bottom_half: active, mask, left): Likewise
---
 linux/dev/arch/i386/kernel/irq.c    |  2 +-
 linux/dev/kernel/softirq.c          |  8 ++++----
 linux/src/include/linux/interrupt.h |  4 ++--
 linux/src/kernel/softirq.c          | 10 +++++-----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/linux/dev/arch/i386/kernel/irq.c b/linux/dev/arch/i386/kernel/irq.c
index 41bdaa3c..68bf0c4b 100644
--- a/linux/dev/arch/i386/kernel/irq.c
+++ b/linux/dev/arch/i386/kernel/irq.c
@@ -72,7 +72,7 @@ spl_t linux_intr_pri;
 /*
  * Flag indicating an interrupt is being handled.
  */
-unsigned long intr_count = 0;
+unsigned int intr_count = 0;
 
 /*
  * List of Linux interrupt handlers.
diff --git a/linux/dev/kernel/softirq.c b/linux/dev/kernel/softirq.c
index 65a0962f..82e1442a 100644
--- a/linux/dev/kernel/softirq.c
+++ b/linux/dev/kernel/softirq.c
@@ -16,15 +16,15 @@
 #include <linux/dev/glue/glue.h>
 
 int bh_mask_count[32];
-unsigned long bh_active = 0;
-unsigned long bh_mask = 0;
+unsigned int bh_active = 0;
+unsigned int bh_mask = 0;
 void (*bh_base[32]) (void);
 
 void
 linux_soft_intr (void)
 {
-  unsigned long active;
-  unsigned long mask, left;
+  unsigned int active;
+  unsigned int mask, left;
   void (**bh) (void);
 
   sti ();
diff --git a/linux/src/include/linux/interrupt.h b/linux/src/include/linux/interrupt.h
index 8654a4f2..5af8f8da 100644
--- a/linux/src/include/linux/interrupt.h
+++ b/linux/src/include/linux/interrupt.h
@@ -17,8 +17,8 @@ struct irqaction {
 extern unsigned long intr_count;
 
 extern int bh_mask_count[32];
-extern unsigned long bh_active;
-extern unsigned long bh_mask;
+extern unsigned int bh_active;
+extern unsigned int bh_mask;
 extern void (*bh_base[32])(void);
 
 asmlinkage void do_bottom_half(void);
diff --git a/linux/src/kernel/softirq.c b/linux/src/kernel/softirq.c
index 022b5535..32038b15 100644
--- a/linux/src/kernel/softirq.c
+++ b/linux/src/kernel/softirq.c
@@ -21,18 +21,18 @@
 #include <asm/irq.h>
 #include <asm/bitops.h>
 
-unsigned long intr_count = 0;
+unsigned int intr_count = 0;
 
 int bh_mask_count[32];
-unsigned long bh_active = 0;
-unsigned long bh_mask = 0;
+unsigned int bh_active = 0;
+unsigned int bh_mask = 0;
 void (*bh_base[32])(void);
 
 
 asmlinkage void do_bottom_half(void)
 {
-	unsigned long active;
-	unsigned long mask, left;
+	unsigned int active;
+	unsigned int mask, left;
 	void (**bh)(void);
 
 	sti();
-- 
cgit v1.2.3