git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'tpm-fixes-for-4.2-rc2' of https://github.com/PeterHuewe/linux-tpmdd into...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
kernel
/
smp.c
diff --git
a/arch/arm/kernel/smp.c
b/arch/arm/kernel/smp.c
index 90dfbedfbfb8527b74ddcfcef125beb151f875f5..3d6b7821cff8c952e73c72cad5a1f8d90cdf1758 100644
(file)
--- a/
arch/arm/kernel/smp.c
+++ b/
arch/arm/kernel/smp.c
@@
-578,7
+578,7
@@
void handle_IPI(int ipinr, struct pt_regs *regs)
struct pt_regs *old_regs = set_irq_regs(regs);
if ((unsigned)ipinr < NR_IPI) {
struct pt_regs *old_regs = set_irq_regs(regs);
if ((unsigned)ipinr < NR_IPI) {
- trace_ipi_entry(ipi_types[ipinr]);
+ trace_ipi_entry
_rcuidle
(ipi_types[ipinr]);
__inc_irq_stat(cpu, ipi_irqs[ipinr]);
}
__inc_irq_stat(cpu, ipi_irqs[ipinr]);
}
@@
-637,7
+637,7
@@
void handle_IPI(int ipinr, struct pt_regs *regs)
}
if ((unsigned)ipinr < NR_IPI)
}
if ((unsigned)ipinr < NR_IPI)
- trace_ipi_exit(ipi_types[ipinr]);
+ trace_ipi_exit
_rcuidle
(ipi_types[ipinr]);
set_irq_regs(old_regs);
}
set_irq_regs(old_regs);
}