openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2017-06-25 11:53:36 -07:00
parent 412572bffa 9f93d87cba
commit 1a8cca1880
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/irqchip/irq-mips-gic.c
View File

@ -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;