Merge branch 'master' into master-gdb_stubs

1 files changed, 5 insertions, 5 deletions

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();