Merge branch 'master' into master-gdb_stubs

1 files changed, 7 insertions, 5 deletions

diff --git a/linux/dev/kernel/softirq.c b/linux/dev/kernel/softirq.c
index 96102a7a..ac95a7dd 100644
--- a/linux/dev/kernel/softirq.c
+++ b/linux/dev/kernel/softirq.c
@@ -13,16 +13,18 @@
 #include <linux/interrupt.h>
 #include <asm/system.h>
 
+#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 ();
@@ -42,5 +44,5 @@ linux_soft_intr (void)
     }
   return;
 bad_bh:
-  printk ("linux_soft_intr:bad interrupt handler entry %08lx\n", mask);
+  printk ("linux_soft_intr:bad interrupt handler entry %08x\n", mask);
 }