Hi Rob,
Today's linux-next merge of the cpuidle-cons tree got a conflict in
drivers/cpuidle/cpuidle.c between commit 76027ea863fc ("cpuidle/tracing:
Denote the tracepoints as being in rcu_idle_exit() section") from the tip
tree and commit 9adbc67f6ecf ("cpuidle: Add common time keeping and irq
enabling") from the cpuidle-cons tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc drivers/cpuidle/cpuidle.c
index 6588f43,56de5f7..0000000
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@@ -92,15 -109,13 +109,13 @@@ int cpuidle_idle_call(void
return 0;
}
- target_state = &drv->states[next_state];
-
- trace_power_start(POWER_CSTATE, next_state, dev->cpu);
- trace_cpu_idle(next_state, dev->cpu);
+ trace_power_start_rcuidle(POWER_CSTATE, next_state, dev->cpu);
+ trace_cpu_idle_rcuidle(next_state, dev->cpu);
- entered_state = target_state->enter(dev, drv, next_state);
+ entered_state = cpuidle_enter_ops(dev, drv, next_state);
- trace_power_end(dev->cpu);
- trace_cpu_idle(PWR_EVENT_EXIT, dev->cpu);
+ trace_power_end_rcuidle(dev->cpu);
+ trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, dev->cpu);
if (entered_state >= 0) {
/* Update cpuidle counters */
Attachment:
pgp3GT0vtYYei.pgp
Description: PGP signature
