diff for duplicates of <20070905130411.GB11880@Krystal> diff --git a/a/1.txt b/N1/1.txt index a844c6d..1a1e247 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -21,7 +21,8 @@ Christoph Lameter <clameter@sgi.com> 3 files changed, 38 insertions(+), 2 deletions(-) Index: linux-2.6-lttng/include/asm-generic/local.h -=================================--- linux-2.6-lttng.orig/include/asm-generic/local.h 2007-09-04 15:32:02.000000000 -0400 +=================================================================== +--- linux-2.6-lttng.orig/include/asm-generic/local.h 2007-09-04 15:32:02.000000000 -0400 +++ linux-2.6-lttng/include/asm-generic/local.h 2007-09-05 08:50:47.000000000 -0400 @@ -46,6 +46,15 @@ typedef struct #define local_add_unless(l, a, u) atomic_long_add_unless((&(l)->a), (a), (u)) @@ -40,7 +41,8 @@ Index: linux-2.6-lttng/include/asm-generic/local.h * in interrupt, etc. Some archs can optimize this case well. */ #define __local_inc(l) local_set((l), local_read(l) + 1) Index: linux-2.6-lttng/include/asm-i386/local.h -=================================--- linux-2.6-lttng.orig/include/asm-i386/local.h 2007-09-04 15:28:52.000000000 -0400 +=================================================================== +--- linux-2.6-lttng.orig/include/asm-i386/local.h 2007-09-04 15:28:52.000000000 -0400 +++ linux-2.6-lttng/include/asm-i386/local.h 2007-09-05 08:49:19.000000000 -0400 @@ -194,6 +194,23 @@ static __inline__ long local_sub_return( }) @@ -67,7 +69,8 @@ Index: linux-2.6-lttng/include/asm-i386/local.h #define __local_inc(l) local_inc(l) #define __local_dec(l) local_dec(l) Index: linux-2.6-lttng/include/asm-ia64/intrinsics.h -=================================--- linux-2.6-lttng.orig/include/asm-ia64/intrinsics.h 2007-09-04 15:47:24.000000000 -0400 +=================================================================== +--- linux-2.6-lttng.orig/include/asm-ia64/intrinsics.h 2007-09-04 15:47:24.000000000 -0400 +++ linux-2.6-lttng/include/asm-ia64/intrinsics.h 2007-09-04 15:49:41.000000000 -0400 @@ -160,8 +160,18 @@ extern long ia64_cmpxchg_called_with_bad #define cmpxchg(ptr,o,n) cmpxchg_acq(ptr,o,n) @@ -82,7 +85,7 @@ Index: linux-2.6-lttng/include/asm-ia64/intrinsics.h + void *before; + + before = *p; -+ if (likely(before = old)) ++ if (likely(before == old)) + *p = new; + return before; +} diff --git a/a/content_digest b/N1/content_digest index 6f7c4a3..0cf3f70 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -10,7 +10,7 @@ "ref\0Pine.LNX.4.64.0709041344040.6376@schroedinger.engr.sgi.com\0" "From\0Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>\0" "Subject\0[PATCH] local_t protection (critical section)\0" - "Date\0Wed, 05 Sep 2007 13:04:11 +0000\0" + "Date\0Wed, 5 Sep 2007 09:04:11 -0400\0" "To\0Christoph Lameter <clameter@sgi.com>\0" "Cc\0Peter Zijlstra <peterz@infradead.org>" akpm@linux-foundation.org @@ -42,7 +42,8 @@ " 3 files changed, 38 insertions(+), 2 deletions(-)\n" "\n" "Index: linux-2.6-lttng/include/asm-generic/local.h\n" - "=================================--- linux-2.6-lttng.orig/include/asm-generic/local.h\t2007-09-04 15:32:02.000000000 -0400\n" + "===================================================================\n" + "--- linux-2.6-lttng.orig/include/asm-generic/local.h\t2007-09-04 15:32:02.000000000 -0400\n" "+++ linux-2.6-lttng/include/asm-generic/local.h\t2007-09-05 08:50:47.000000000 -0400\n" "@@ -46,6 +46,15 @@ typedef struct\n" " #define local_add_unless(l, a, u) atomic_long_add_unless((&(l)->a), (a), (u))\n" @@ -61,7 +62,8 @@ " * in interrupt, etc. Some archs can optimize this case well. */\n" " #define __local_inc(l)\t\tlocal_set((l), local_read(l) + 1)\n" "Index: linux-2.6-lttng/include/asm-i386/local.h\n" - "=================================--- linux-2.6-lttng.orig/include/asm-i386/local.h\t2007-09-04 15:28:52.000000000 -0400\n" + "===================================================================\n" + "--- linux-2.6-lttng.orig/include/asm-i386/local.h\t2007-09-04 15:28:52.000000000 -0400\n" "+++ linux-2.6-lttng/include/asm-i386/local.h\t2007-09-05 08:49:19.000000000 -0400\n" "@@ -194,6 +194,23 @@ static __inline__ long local_sub_return(\n" " })\n" @@ -88,7 +90,8 @@ " #define __local_inc(l)\t\tlocal_inc(l)\n" " #define __local_dec(l)\t\tlocal_dec(l)\n" "Index: linux-2.6-lttng/include/asm-ia64/intrinsics.h\n" - "=================================--- linux-2.6-lttng.orig/include/asm-ia64/intrinsics.h\t2007-09-04 15:47:24.000000000 -0400\n" + "===================================================================\n" + "--- linux-2.6-lttng.orig/include/asm-ia64/intrinsics.h\t2007-09-04 15:47:24.000000000 -0400\n" "+++ linux-2.6-lttng/include/asm-ia64/intrinsics.h\t2007-09-04 15:49:41.000000000 -0400\n" "@@ -160,8 +160,18 @@ extern long ia64_cmpxchg_called_with_bad\n" " #define cmpxchg(ptr,o,n)\tcmpxchg_acq(ptr,o,n)\n" @@ -103,7 +106,7 @@ "+\tvoid *before;\n" "+\n" "+\tbefore = *p;\n" - "+\tif (likely(before = old))\n" + "+\tif (likely(before == old))\n" "+\t\t*p = new;\n" "+\treturn before;\n" "+}\n" @@ -117,4 +120,4 @@ "Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal\n" OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68 -fc91eec790d9c999a91d686ccc087c1b86f417ef2dd92515a5c0c14eeb4e2f4e +a331cd7c719ebfaee251602d6eda294f152aae29915e6278a65372a2706fc7c5
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.