tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds e9ebc215 d2ff0ff2

+3 -3
+2 -2
drivers/irqchip/irq-mvebu-sei.c
··· 384 384 385 385 sei->res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 386 386 sei->base = devm_ioremap_resource(sei->dev, sei->res); 387 - if (!sei->base) { 387 + if (IS_ERR(sei->base)) { 388 388 dev_err(sei->dev, "Failed to remap SEI resource\n"); 389 - return -ENODEV; 389 + return PTR_ERR(sei->base); 390 390 } 391 391 392 392 /* Retrieve the SEI capabilities with the interrupt ranges */
+1 -1
kernel/irq/matrix.c
··· 8 8 #include <linux/cpu.h> 9 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 13 struct cpumap { 14 14 unsigned int available;