diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-03 18:12:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-03 18:12:09 -0700 |
| commit | e9ebc2151f88600e726e51e5f7ca9c33ad53b35f (patch) | |
| tree | 5b709aba6075f4e2f94e9ed9f09e868df7be63ab /kernel | |
| parent | Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc (diff) | |
| parent | irqchip/irq-mvebu-sei: Fix a NULL vs IS_ERR() bug in probe function (diff) | |
| download | linux-dev-e9ebc2151f88600e726e51e5f7ca9c33ad53b35f.tar.xz linux-dev-e9ebc2151f88600e726e51e5f7ca9c33ad53b35f.zip | |
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 @@ #include <linux/cpu.h> #include <linux/irq.h> -#define IRQ_MATRIX_SIZE (BITS_TO_LONGS(IRQ_MATRIX_BITS) * sizeof(unsigned long)) +#define IRQ_MATRIX_SIZE (BITS_TO_LONGS(IRQ_MATRIX_BITS)) struct cpumap { unsigned int available; |