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 tag 'sh-for-v6.12-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux

Pull sh updates from John Paul Adrian Glaubitz:
"The first change by Gaosheng Cui removes unused declarations which
have been obsoleted since commit 5a4053b23262 ("sh: Kill off dead
boards.") and the second by his colleague Hongbo Li replaces the use
of the unsafe simple_strtoul() with the safer kstrtoul() function in
the sh interrupt controller driver code"

* tag 'sh-for-v6.12-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux:
sh: intc: Replace simple_strtoul() with kstrtoul()
sh: Remove unused declarations for make_maskreg_irq() and irq_mask_register

Linus Torvalds ec384984 653608c6

+4 -7
-6
arch/sh/include/asm/irq.h
··· 14 14 #define NO_IRQ_IGNORE ((unsigned int)-1) 15 15 16 16 /* 17 - * Simple Mask Register Support 18 - */ 19 - extern void make_maskreg_irq(unsigned int irq); 20 - extern unsigned short *irq_mask_register; 21 - 22 - /* 23 17 * PINT IRQs 24 18 */ 25 19 void make_imask_irq(unsigned int irq);
+4 -1
drivers/sh/intc/userimask.c
··· 32 32 const char *buf, size_t count) 33 33 { 34 34 unsigned long level; 35 + int ret; 35 36 36 - level = simple_strtoul(buf, NULL, 10); 37 + ret = kstrtoul(buf, 10, &level); 38 + if (ret != 0) 39 + return ret; 37 40 38 41 /* 39 42 * Minimal acceptable IRQ levels are in the 2 - 16 range, but