diff for duplicates of <1282281295.22370.400.camel@pasglop> diff --git a/a/1.txt b/N1/1.txt index 45288da..5880fa9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -72,7 +72,7 @@ index 24cd928..8447d89 100644 + long tmp; while ((tmp = sem->count) >= 0) { - if (tmp == cmpxchg(&sem->count, tmp, + if (tmp = cmpxchg(&sem->count, tmp, @@ -92,10 +101,10 @@ static inline int __down_read_trylock(struct rw_semaphore *sem) */ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass) @@ -105,7 +105,7 @@ index 24cd928..8447d89 100644 - tmp = atomic_dec_return((atomic_t *)(&sem->count)); + 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); } @@ -131,17 +140,17 @@ static inline void __up_read(struct rw_semaphore *sem) diff --git a/a/content_digest b/N1/content_digest index 5c3fd8b..a8788db 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,7 +4,7 @@ "ref\020100818.222925.233689776.davem@davemloft.net\0" "From\0Benjamin Herrenschmidt <benh@kernel.crashing.org>\0" "Subject\0[PATCH 1/2] powerpc: Make rwsem use \"long\" type\0" - "Date\0Fri, 20 Aug 2010 15:14:55 +1000\0" + "Date\0Fri, 20 Aug 2010 05:14:55 +0000\0" "To\0torvalds@linux-foundation.org\0" "Cc\0paulus@au.ibm.com" linux-kernel@vger.kernel.org @@ -88,7 +88,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" "@@ -92,10 +101,10 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)\n" " */\n" " static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)\n" @@ -121,7 +121,7 @@ " \n" "-\ttmp = atomic_dec_return((atomic_t *)(&sem->count));\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" "@@ -131,17 +140,17 @@ static inline void __up_read(struct rw_semaphore *sem)\n" @@ -178,4 +178,4 @@ " \n" " #endif\t/* __KERNEL__ */" -90c506e3977144d08a04d6b1d60c02dbf894631932365d1b017e0831c99eb66f +618ee8a7bdd3575e0f120098d099797c02e19839b8443ab9f8d0bcd8028ef24e
diff --git a/a/content_digest b/N2/content_digest index 5c3fd8b..ecd4901 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -6,10 +6,10 @@ "Subject\0[PATCH 1/2] powerpc: Make rwsem use \"long\" type\0" "Date\0Fri, 20 Aug 2010 15:14:55 +1000\0" "To\0torvalds@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" @@ -178,4 +178,4 @@ " \n" " #endif\t/* __KERNEL__ */" -90c506e3977144d08a04d6b1d60c02dbf894631932365d1b017e0831c99eb66f +8301bea1df67a3cf1d770e5ca9496daeae90b9ea9861c81c2886730979f3c944
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.