diff for duplicates of <20150120104359.GC24303@arm.com> diff --git a/a/1.txt b/N1/1.txt index fc7fd0d..72642e6 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -42,45 +42,3 @@ Patch below, thanks. Will --->8 - -From bf5921b5105db177517d7a951dc0e64e3bb0dd51 Mon Sep 17 00:00:00 2001 -From: Will Deacon <will.deacon@arm.com> -Date: Tue, 20 Jan 2015 10:32:01 +0000 -Subject: [PATCH] documentation: memory-barriers: fix smp_mb__before_spinlock() - semantics - -Our current documentation claims that, when followed by an ACQUIRE, -smp_mb__before_spinlock() orders prior loads against subsequent loads -and stores, which isn't actually true. - -Fix the documentation to state that this sequence orders only prior -stores against subsequent loads and stores. - -Cc: Oleg Nesterov <oleg@redhat.com> -Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> -Cc: Peter Zijlstra <peterz@infradead.org> -Signed-off-by: Will Deacon <will.deacon@arm.com> ---- - Documentation/memory-barriers.txt | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/Documentation/memory-barriers.txt b/Documentation/memory-barriers.txt -index 70a09f8a0383..9c0e3c45a807 100644 ---- a/Documentation/memory-barriers.txt -+++ b/Documentation/memory-barriers.txt -@@ -1724,10 +1724,9 @@ for each construct. These operations all imply certain barriers: - - Memory operations issued before the ACQUIRE may be completed after - the ACQUIRE operation has completed. An smp_mb__before_spinlock(), -- combined with a following ACQUIRE, orders prior loads against -- subsequent loads and stores and also orders prior stores against -- subsequent stores. Note that this is weaker than smp_mb()! The -- smp_mb__before_spinlock() primitive is free on many architectures. -+ combined with a following ACQUIRE, orders prior stores against -+ subsequent loads and stores. Note that this is weaker than smp_mb()! -+ The smp_mb__before_spinlock() primitive is free on many architectures. - - (2) RELEASE operation implication: - --- -2.1.4 diff --git a/a/content_digest b/N1/content_digest index 6245cae..1f4ec05 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -57,48 +57,6 @@ "\n" "Will\n" "\n" - "--->8\n" - "\n" - "From bf5921b5105db177517d7a951dc0e64e3bb0dd51 Mon Sep 17 00:00:00 2001\n" - "From: Will Deacon <will.deacon@arm.com>\n" - "Date: Tue, 20 Jan 2015 10:32:01 +0000\n" - "Subject: [PATCH] documentation: memory-barriers: fix smp_mb__before_spinlock()\n" - " semantics\n" - "\n" - "Our current documentation claims that, when followed by an ACQUIRE,\n" - "smp_mb__before_spinlock() orders prior loads against subsequent loads\n" - "and stores, which isn't actually true.\n" - "\n" - "Fix the documentation to state that this sequence orders only prior\n" - "stores against subsequent loads and stores.\n" - "\n" - "Cc: Oleg Nesterov <oleg@redhat.com>\n" - "Cc: \"Paul E. McKenney\" <paulmck@linux.vnet.ibm.com>\n" - "Cc: Peter Zijlstra <peterz@infradead.org>\n" - "Signed-off-by: Will Deacon <will.deacon@arm.com>\n" - "---\n" - " Documentation/memory-barriers.txt | 7 +++----\n" - " 1 file changed, 3 insertions(+), 4 deletions(-)\n" - "\n" - "diff --git a/Documentation/memory-barriers.txt b/Documentation/memory-barriers.txt\n" - "index 70a09f8a0383..9c0e3c45a807 100644\n" - "--- a/Documentation/memory-barriers.txt\n" - "+++ b/Documentation/memory-barriers.txt\n" - "@@ -1724,10 +1724,9 @@ for each construct. These operations all imply certain barriers:\n" - " \n" - " Memory operations issued before the ACQUIRE may be completed after\n" - " the ACQUIRE operation has completed. An smp_mb__before_spinlock(),\n" - "- combined with a following ACQUIRE, orders prior loads against\n" - "- subsequent loads and stores and also orders prior stores against\n" - "- subsequent stores. Note that this is weaker than smp_mb()! The\n" - "- smp_mb__before_spinlock() primitive is free on many architectures.\n" - "+ combined with a following ACQUIRE, orders prior stores against\n" - "+ subsequent loads and stores. Note that this is weaker than smp_mb()!\n" - "+ The smp_mb__before_spinlock() primitive is free on many architectures.\n" - " \n" - " (2) RELEASE operation implication:\n" - " \n" - "-- \n" - 2.1.4 + --->8 -0da026fb6aa1abf61c9fb26c5ea32d6a105c565d26662da1553297335aaab7cc +7bd2037ced7190b7ed010f05cb617b7b7b782ca91a136e3c4f5a1269eed68fe5
diff --git a/a/1.txt b/N2/1.txt index fc7fd0d..55c382d 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -43,7 +43,7 @@ Will --->8 -From bf5921b5105db177517d7a951dc0e64e3bb0dd51 Mon Sep 17 00:00:00 2001 +>From bf5921b5105db177517d7a951dc0e64e3bb0dd51 Mon Sep 17 00:00:00 2001 From: Will Deacon <will.deacon@arm.com> Date: Tue, 20 Jan 2015 10:32:01 +0000 Subject: [PATCH] documentation: memory-barriers: fix smp_mb__before_spinlock() diff --git a/a/content_digest b/N2/content_digest index 6245cae..6c722d6 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -59,7 +59,7 @@ "\n" "--->8\n" "\n" - "From bf5921b5105db177517d7a951dc0e64e3bb0dd51 Mon Sep 17 00:00:00 2001\n" + ">From bf5921b5105db177517d7a951dc0e64e3bb0dd51 Mon Sep 17 00:00:00 2001\n" "From: Will Deacon <will.deacon@arm.com>\n" "Date: Tue, 20 Jan 2015 10:32:01 +0000\n" "Subject: [PATCH] documentation: memory-barriers: fix smp_mb__before_spinlock()\n" @@ -101,4 +101,4 @@ "-- \n" 2.1.4 -0da026fb6aa1abf61c9fb26c5ea32d6a105c565d26662da1553297335aaab7cc +f9c80cca5e0ec1addee1b588a38be345480303fba6dca9516261ae08f51bac37
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.