diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-03 21:12:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-03 21:12:09 -0400 |
| commit | e9ebc2151f88600e726e51e5f7ca9c33ad53b35f (patch) | |
| tree | 5b709aba6075f4e2f94e9ed9f09e868df7be63ab /kernel | |
| parent | d2ff0ff2c23f1bacd35073bf50e6c18298a8d530 (diff) | |
| parent | 3424243e39e8ec138486926949e3668e7553125d (diff) | |
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fixes from Ingo Molnar:
"An irqchip driver fix and a memory (over-)allocation fix"
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
irqchip/irq-mvebu-sei: Fix a NULL vs IS_ERR() bug in probe function
irq/matrix: Fix memory overallocation
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/irq/matrix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/irq/matrix.c b/kernel/irq/matrix.c index 6e6d467f3dec..1f0985adf193 100644 --- a/kernel/irq/matrix.c +++ b/kernel/irq/matrix.c | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | #include <linux/cpu.h> | 8 | #include <linux/cpu.h> |
| 9 | #include <linux/irq.h> | 9 | #include <linux/irq.h> |
| 10 | 10 | ||
| 11 | #define IRQ_MATRIX_SIZE (BITS_TO_LONGS(IRQ_MATRIX_BITS) * sizeof(unsigned long)) | 11 | #define IRQ_MATRIX_SIZE (BITS_TO_LONGS(IRQ_MATRIX_BITS)) |
| 12 | 12 | ||
| 13 | struct cpumap { | 13 | struct cpumap { |
| 14 | unsigned int available; | 14 | unsigned int available; |