diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-24 15:40:57 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-24 15:40:57 +0100 |
| commit | 944cdcda15d461c87e6310694bdb8371a88ac7ff (patch) | |
| tree | 53c4bb5d567f5cb87f3f17e72bd933c3c3454bed /arch/arm64/include/asm/hardirq.h | |
| parent | bb12d86e9fa99cc23927d5c90b125c31534ecf14 (diff) | |
| parent | b7cd0dbce754d20e841b0c27c177ea91e96481f3 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-androidlsk-v3.14-android-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; |