Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a8cca18 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 412572bf 9f93d87c

drivers/irqchip/irq-mips-gic.c

+3 −3
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ static inline void gic_map_to_vpe(unsigned int intr, unsigned int vpe) 
}



#ifdef CONFIG_CLKSRC_MIPS_GIC

u64 gic_read_count(void)

u64 notrace gic_read_count(void)

{

	unsigned int hi, hi2, lo;
@@ -167,7 +167,7 @@ unsigned int gic_get_count_width(void) 
	return bits;

}



void gic_write_compare(u64 cnt)

void notrace gic_write_compare(u64 cnt)

{

	if (mips_cm_is64) {

		gic_write(GIC_REG(VPE_LOCAL, GIC_VPE_COMPARE), cnt);
@@ -179,7 +179,7 @@ void gic_write_compare(u64 cnt) 
	}

}



void gic_write_cpu_compare(u64 cnt, int cpu)

void notrace gic_write_cpu_compare(u64 cnt, int cpu)

{

	unsigned long flags;