diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-24 15:40:59 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-24 15:40:59 +0100 |
| commit | e4019281668f06b809efee13b7e8b2bbee7e1dae (patch) | |
| tree | 53babf9a5850e7dced65bccdcb8ecc97697bbc21 /arch/arm64/include/asm/hardirq.h | |
| parent | 5edd3bfd1e1faee5325d8dd8fd832a66ccc718f4 (diff) | |
| parent | b7cd0dbce754d20e841b0c27c177ea91e96481f3 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-rtlsk-v3.14-rt-14.10
Diffstat (limited to 'arch/arm64/include/asm/hardirq.h')
| -rw-r--r-- | arch/arm64/include/asm/hardirq.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/hardirq.h b/arch/arm64/include/asm/hardirq.h index ae4801d77514..0be67821f9ce 100644 --- a/arch/arm64/include/asm/hardirq.h +++ b/arch/arm64/include/asm/hardirq.h @@ -20,7 +20,7 @@ #include <linux/threads.h> #include <asm/irq.h> -#define NR_IPI 5 +#define NR_IPI 6 typedef struct { unsigned int __softirq_pending; |