Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Kernel bump from 4.1.3-rt to 4.1.7-rt.
[kvmfornfv.git]
/
kernel
/
kernel
/
trace
/
trace_irqsoff.c
diff --git
a/kernel/kernel/trace/trace_irqsoff.c
b/kernel/kernel/trace/trace_irqsoff.c
index
aaade2e
..
d0e1d0e
100644
(file)
--- a/
kernel/kernel/trace/trace_irqsoff.c
+++ b/
kernel/kernel/trace/trace_irqsoff.c
@@
-450,7
+450,7
@@
EXPORT_SYMBOL_GPL(stop_critical_timings);
#ifdef CONFIG_PROVE_LOCKING
void time_hardirqs_on(unsigned long a0, unsigned long a1)
{
#ifdef CONFIG_PROVE_LOCKING
void time_hardirqs_on(unsigned long a0, unsigned long a1)
{
- trace_preemptirqsoff_hist(IRQS_ON, 0);
+ trace_preemptirqsoff_hist
_rcuidle
(IRQS_ON, 0);
if (!preempt_trace() && irq_trace())
stop_critical_timing(a0, a1);
}
if (!preempt_trace() && irq_trace())
stop_critical_timing(a0, a1);
}
@@
-459,7
+459,7
@@
void time_hardirqs_off(unsigned long a0, unsigned long a1)
{
if (!preempt_trace() && irq_trace())
start_critical_timing(a0, a1);
{
if (!preempt_trace() && irq_trace())
start_critical_timing(a0, a1);
- trace_preemptirqsoff_hist(IRQS_OFF, 1);
+ trace_preemptirqsoff_hist
_rcuidle
(IRQS_OFF, 1);
}
#else /* !CONFIG_PROVE_LOCKING */
}
#else /* !CONFIG_PROVE_LOCKING */