l...@kernel.org [l...@kernel.org] wrote:
| From: Cong Wang <cw...@twopensource.com>
|
| 3.4.105-rc1 review patch. If anyone has any objections, please let me know.
|
<snip>
|
| diff --git a/kernel/events/core.c b/kernel/events/core.c
| index 685ce46..c958be1 100644
| --- a/kernel/events/core.c
| +++ b/kernel/events/core.c
| @@ -1702,6 +1702,16 @@ retry:
| */
| if (ctx->is_active) {
| raw_spin_unlock_irq(&ctx->lock);
| + /*
| + * Reload the task pointer, it might have been changed by
| + * a concurrent perf_event_context_sched_out().
| + */
| + task = ctx->task;
| + /*
| + * Reload the task pointer, it might have been changed by
| + * a concurrent perf_event_context_sched_out().
| + */
| + task = ctx->task;
Something wrong in the way the patch was applied ?
The lines are identical...
The original commit, 3577af70, has the change applied in two
places: perf_event_disable() and perf_remove_from_context().
| goto retry;
| }
|
| --
| 1.9.1
|
| --
| To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
| the body of a message to majord...@vger.kernel.org
| More majordomo info at http://vger.kernel.org/majordomo-info.html
| Please read the FAQ at http://www.tux.org/lkml/
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
