| commit | df762eccbadf87850fbee444d729e0f1b1e946f1 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Tue Nov 12 10:58:59 2013 +0000 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Tue Nov 12 10:58:59 2013 +0000 |
| tree | 1bf47bbbd4ea91e343f983b3b50ec2ec73a739e1 | |
| parent | ec1e20a02fe33b767ffcca8920a32211492416d7 [diff] [blame] | |
| parent | 70d42126877b9faa272d446a6de5917614c28dd9 [diff] [blame] |
Merge branch 'devel-stable' into for-next Conflicts: arch/arm/include/asm/atomic.h arch/arm/include/asm/hardirq.h arch/arm/kernel/smp.c
diff --git a/arch/arm/include/asm/hardirq.h b/arch/arm/include/asm/hardirq.h index 3d7351c..fe3ea77 100644 --- a/arch/arm/include/asm/hardirq.h +++ b/arch/arm/include/asm/hardirq.h
@@ -5,7 +5,7 @@ #include <linux/threads.h> #include <asm/irq.h> -#define NR_IPI 7 +#define NR_IPI 8 typedef struct { unsigned int __softirq_pending;