diff for duplicates of <20150722231916.GA1863@us.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 94ea0df..230b55d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -11,7 +11,7 @@ Do you mean something like this (will move the rename to a separate patch before posting): -- -From e8eddb5d3877ebdb3b71213a00aaa980f4010dd0 Mon Sep 17 00:00:00 2001 +>From e8eddb5d3877ebdb3b71213a00aaa980f4010dd0 Mon Sep 17 00:00:00 2001 From: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> Date: Tue, 7 Jul 2015 21:45:23 -0400 Subject: [PATCH 1/1] perf: Define PMU_TXN_READ interface diff --git a/a/content_digest b/N1/content_digest index 36917b9..fb48218 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -29,7 +29,7 @@ "patch before posting):\n" "--\n" "\n" - "From e8eddb5d3877ebdb3b71213a00aaa980f4010dd0 Mon Sep 17 00:00:00 2001\n" + ">From e8eddb5d3877ebdb3b71213a00aaa980f4010dd0 Mon Sep 17 00:00:00 2001\n" "From: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>\n" "Date: Tue, 7 Jul 2015 21:45:23 -0400\n" "Subject: [PATCH 1/1] perf: Define PMU_TXN_READ interface\n" @@ -206,4 +206,4 @@ "-- \n" 1.7.9.5 -52acfe4fc5bd7e4224eef4bf575263fb206fbefe2ca3a366bacd0da4d85b46ff +b2cec0b4d43f77df6c0a61c48fe8324e11f225dafbe7245501da147619ec5227
diff --git a/a/1.txt b/N2/1.txt index 94ea0df..76f0171 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -99,11 +99,11 @@ index a6bd09d..7177dd8 100644 if (event->pmu->count) @@ -3220,7 +3226,7 @@ static void perf_event_read(struct perf_event *event) */ - if (event->state == PERF_EVENT_STATE_ACTIVE) { + if (event->state = PERF_EVENT_STATE_ACTIVE) { smp_call_function_single(event->oncpu, - __perf_event_read, event, 1); + __perf_event_read_ipi, event, 1); - } else if (event->state == PERF_EVENT_STATE_INACTIVE) { + } else if (event->state = PERF_EVENT_STATE_INACTIVE) { struct perf_event_context *ctx = event->ctx; unsigned long flags; @@ -3765,6 +3771,36 @@ static void orphans_remove_work(struct work_struct *work) diff --git a/a/content_digest b/N2/content_digest index 36917b9..b2acbda 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -5,7 +5,7 @@ "ref\020150722055503.GO25159@twins.programming.kicks-ass.net\0" "From\0Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>\0" "Subject\0Re: [PATCH v3 7/8] perf: Define PMU_TXN_READ interface\0" - "Date\0Wed, 22 Jul 2015 16:19:16 -0700\0" + "Date\0Wed, 22 Jul 2015 23:19:16 +0000\0" "To\0Peter Zijlstra <peterz@infradead.org>\0" "Cc\0Ingo Molnar <mingo@redhat.com>" Arnaldo Carvalho de Melo <acme@kernel.org> @@ -117,11 +117,11 @@ " \tif (event->pmu->count)\n" "@@ -3220,7 +3226,7 @@ static void perf_event_read(struct perf_event *event)\n" " \t */\n" - " \tif (event->state == PERF_EVENT_STATE_ACTIVE) {\n" + " \tif (event->state = PERF_EVENT_STATE_ACTIVE) {\n" " \t\tsmp_call_function_single(event->oncpu,\n" "-\t\t\t\t\t __perf_event_read, event, 1);\n" "+\t\t\t\t\t __perf_event_read_ipi, event, 1);\n" - " \t} else if (event->state == PERF_EVENT_STATE_INACTIVE) {\n" + " \t} else if (event->state = PERF_EVENT_STATE_INACTIVE) {\n" " \t\tstruct perf_event_context *ctx = event->ctx;\n" " \t\tunsigned long flags;\n" "@@ -3765,6 +3771,36 @@ static void orphans_remove_work(struct work_struct *work)\n" @@ -206,4 +206,4 @@ "-- \n" 1.7.9.5 -52acfe4fc5bd7e4224eef4bf575263fb206fbefe2ca3a366bacd0da4d85b46ff +1993d6437e24e02868f4f75a493bfd987583383050305b917650aacbb303d575
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.