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 fix from Thomas Gleixner:
"A single fix for the MIPS GIC to prevent ftrace recursion"

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
irqchip/mips-gic: Mark count and compare accessors notrace

+3 -3
+3 -3
drivers/irqchip/irq-mips-gic.c
··· 140 140 } 141 141 142 142 #ifdef CONFIG_CLKSRC_MIPS_GIC 143 - u64 gic_read_count(void) 143 + u64 notrace gic_read_count(void) 144 144 { 145 145 unsigned int hi, hi2, lo; 146 146 ··· 167 167 return bits; 168 168 } 169 169 170 - void gic_write_compare(u64 cnt) 170 + void notrace gic_write_compare(u64 cnt) 171 171 { 172 172 if (mips_cm_is64) { 173 173 gic_write(GIC_REG(VPE_LOCAL, GIC_VPE_COMPARE), cnt); ··· 179 179 } 180 180 } 181 181 182 - void gic_write_cpu_compare(u64 cnt, int cpu) 182 + void notrace gic_write_cpu_compare(u64 cnt, int cpu) 183 183 { 184 184 unsigned long flags; 185 185