summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2012-03-14 01:27:56 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2012-03-14 01:27:56 +0100
commit5f701793f63f16d111db3e3d2e91134fcc179c5b (patch)
treeff2a9f9351f4f075e42ce08b117be355f52b3516
parent5378113a56ef2bda1b2b9f594d250574ca697615 (diff)
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
-rw-r--r--linux/dev/arch/i386/kernel/irq.c2
-rw-r--r--linux/dev/kernel/softirq.c8
-rw-r--r--linux/src/include/linux/interrupt.h4
-rw-r--r--linux/src/kernel/softirq.c10
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 41bdaa3..68bf0c4 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 65a0962..82e1442 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 8654a4f..5af8f8d 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 022b553..32038b1 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();