diff for duplicates of <1282281295.22370.401.camel@pasglop> diff --git a/a/1.txt b/N1/1.txt index 97c7fb6..986b2d2 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -103,7 +103,7 @@ index 8447d89..1237ad6 100644 - long tmp; - - while ((tmp = sem->count) >= 0) { -- if (tmp == cmpxchg(&sem->count, tmp, +- if (tmp = cmpxchg(&sem->count, tmp, - tmp + RWSEM_ACTIVE_READ_BIAS)) { - return 1; - } @@ -135,7 +135,7 @@ index 8447d89..1237ad6 100644 - - tmp = cmpxchg(&sem->count, RWSEM_UNLOCKED_VALUE, - RWSEM_ACTIVE_WRITE_BIAS); -- return tmp == RWSEM_UNLOCKED_VALUE; +- return tmp = RWSEM_UNLOCKED_VALUE; -} - -/* @@ -146,7 +146,7 @@ index 8447d89..1237ad6 100644 - long tmp; - - tmp = atomic_long_dec_return((atomic_long_t *)&sem->count); -- if (unlikely(tmp < -1 && (tmp & RWSEM_ACTIVE_MASK) == 0)) +- if (unlikely(tmp < -1 && (tmp & RWSEM_ACTIVE_MASK) = 0)) - rwsem_wake(sem); -} - @@ -226,7 +226,7 @@ index 0000000..2b1c859 +/* + * the semaphore definition + */ -+#if BITS_PER_LONG == 64 ++#if BITS_PER_LONG = 64 +# define RWSEM_ACTIVE_MASK 0xffffffffL +#else +# define RWSEM_ACTIVE_MASK 0x0000ffffL @@ -293,7 +293,7 @@ index 0000000..2b1c859 + long tmp; + + while ((tmp = sem->count) >= 0) { -+ if (tmp == cmpxchg(&sem->count, tmp, ++ if (tmp = cmpxchg(&sem->count, tmp, + tmp + RWSEM_ACTIVE_READ_BIAS)) { + return 1; + } @@ -325,7 +325,7 @@ index 0000000..2b1c859 + + tmp = cmpxchg(&sem->count, RWSEM_UNLOCKED_VALUE, + RWSEM_ACTIVE_WRITE_BIAS); -+ return tmp == RWSEM_UNLOCKED_VALUE; ++ return tmp = RWSEM_UNLOCKED_VALUE; +} + +/* @@ -336,7 +336,7 @@ index 0000000..2b1c859 + long tmp; + + tmp = atomic_long_dec_return((atomic_long_t *)&sem->count); -+ if (unlikely(tmp < -1 && (tmp & RWSEM_ACTIVE_MASK) == 0)) ++ if (unlikely(tmp < -1 && (tmp & RWSEM_ACTIVE_MASK) = 0)) + rwsem_wake(sem); +} + diff --git a/a/content_digest b/N1/content_digest index 37efb93..8b87d20 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,8 +3,8 @@ "ref\01282195403.22370.296.camel@pasglop\0" "ref\020100818.222925.233689776.davem@davemloft.net\0" "From\0Benjamin Herrenschmidt <benh@kernel.crashing.org>\0" - "Subject\0[PATCH 2/2] rwsem: Move powerpc atomic-long based implementation to asm-generic\0" - "Date\0Fri, 20 Aug 2010 15:14:55 +1000\0" + "Subject\0[PATCH 2/2] rwsem: Move powerpc atomic-long based implementation\0" + "Date\0Fri, 20 Aug 2010 05:14:55 +0000\0" "To\0Linus Torvalds <torvalds@linux-foundation.org>\0" "Cc\0paulus@au.ibm.com" linux-kernel@vger.kernel.org @@ -119,7 +119,7 @@ "-\tlong tmp;\n" "-\n" "-\twhile ((tmp = sem->count) >= 0) {\n" - "-\t\tif (tmp == cmpxchg(&sem->count, tmp,\n" + "-\t\tif (tmp = cmpxchg(&sem->count, tmp,\n" "-\t\t\t\t tmp + RWSEM_ACTIVE_READ_BIAS)) {\n" "-\t\t\treturn 1;\n" "-\t\t}\n" @@ -151,7 +151,7 @@ "-\n" "-\ttmp = cmpxchg(&sem->count, RWSEM_UNLOCKED_VALUE,\n" "-\t\t RWSEM_ACTIVE_WRITE_BIAS);\n" - "-\treturn tmp == RWSEM_UNLOCKED_VALUE;\n" + "-\treturn tmp = RWSEM_UNLOCKED_VALUE;\n" "-}\n" "-\n" "-/*\n" @@ -162,7 +162,7 @@ "-\tlong tmp;\n" "-\n" "-\ttmp = atomic_long_dec_return((atomic_long_t *)&sem->count);\n" - "-\tif (unlikely(tmp < -1 && (tmp & RWSEM_ACTIVE_MASK) == 0))\n" + "-\tif (unlikely(tmp < -1 && (tmp & RWSEM_ACTIVE_MASK) = 0))\n" "-\t\trwsem_wake(sem);\n" "-}\n" "-\n" @@ -242,7 +242,7 @@ "+/*\n" "+ * the semaphore definition\n" "+ */\n" - "+#if BITS_PER_LONG == 64\n" + "+#if BITS_PER_LONG = 64\n" "+# define RWSEM_ACTIVE_MASK\t\t0xffffffffL\n" "+#else\n" "+# define RWSEM_ACTIVE_MASK\t\t0x0000ffffL\n" @@ -309,7 +309,7 @@ "+\tlong tmp;\n" "+\n" "+\twhile ((tmp = sem->count) >= 0) {\n" - "+\t\tif (tmp == cmpxchg(&sem->count, tmp,\n" + "+\t\tif (tmp = cmpxchg(&sem->count, tmp,\n" "+\t\t\t\t tmp + RWSEM_ACTIVE_READ_BIAS)) {\n" "+\t\t\treturn 1;\n" "+\t\t}\n" @@ -341,7 +341,7 @@ "+\n" "+\ttmp = cmpxchg(&sem->count, RWSEM_UNLOCKED_VALUE,\n" "+\t\t RWSEM_ACTIVE_WRITE_BIAS);\n" - "+\treturn tmp == RWSEM_UNLOCKED_VALUE;\n" + "+\treturn tmp = RWSEM_UNLOCKED_VALUE;\n" "+}\n" "+\n" "+/*\n" @@ -352,7 +352,7 @@ "+\tlong tmp;\n" "+\n" "+\ttmp = atomic_long_dec_return((atomic_long_t *)&sem->count);\n" - "+\tif (unlikely(tmp < -1 && (tmp & RWSEM_ACTIVE_MASK) == 0))\n" + "+\tif (unlikely(tmp < -1 && (tmp & RWSEM_ACTIVE_MASK) = 0))\n" "+\t\trwsem_wake(sem);\n" "+}\n" "+\n" @@ -403,4 +403,4 @@ "+#endif\t/* __KERNEL__ */\n" "+#endif\t/* _RWSEM_CMPXCHG_H */" -1f8c0eb1bbba513e6b35641a350b64049da87d8f2253440991939650b5761a8e +a718bd7624b5ee47f9708323846f57a5558109f49217450e3c21d01c013113dd
diff --git a/a/content_digest b/N2/content_digest index 37efb93..376e69d 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -6,10 +6,10 @@ "Subject\0[PATCH 2/2] rwsem: Move powerpc atomic-long based implementation to asm-generic\0" "Date\0Fri, 20 Aug 2010 15:14:55 +1000\0" "To\0Linus Torvalds <torvalds@linux-foundation.org>\0" - "Cc\0paulus@au.ibm.com" - linux-kernel@vger.kernel.org + "Cc\0akpm@linux-foundation.org" sparclinux@vger.kernel.org - akpm@linux-foundation.org + linux-kernel@vger.kernel.org + paulus@au.ibm.com linuxppc-dev@lists.ozlabs.org " David Miller <davem@davemloft.net>\0" "\00:1\0" @@ -403,4 +403,4 @@ "+#endif\t/* __KERNEL__ */\n" "+#endif\t/* _RWSEM_CMPXCHG_H */" -1f8c0eb1bbba513e6b35641a350b64049da87d8f2253440991939650b5761a8e +6d4428c9613ea17a6adeed72cc31198dde313899fb27c5d952ff2c615e8ea1e5
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.