Merge branch 'fix/hda' into for-linus

[karo-tx-linux.git] / include / asm-generic / hardirq.h

diff --git a/include/asm-generic/hardirq.h b/include/asm-generic/hardirq.h
index 23bb4dad4962cee55b3d39f9ce14edda6043cb9c..62f59080e5cc215edb843f928763d9898055071f 100644 (file)
--- a/include/asm-generic/hardirq.h
+++ b/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 */