diff for duplicates of <1282106338.22370.151.camel@pasglop>

diff --git a/a/1.txt b/N1/1.txt
index bd9cac5..398af9e 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -91,9 +91,9 @@ index 24cd928..ca64a98 100644
 +	long tmp;
  
 -	while ((tmp = sem->count) >= 0) {
--		if (tmp == cmpxchg(&sem->count, tmp,
+-		if (tmp = cmpxchg(&sem->count, tmp,
 +	while ((tmp = atomic_long_read(&sem->count)) >= 0) {
-+		if (tmp == cmpxchg((long *)&sem->count, tmp,
++		if (tmp = cmpxchg((long *)&sem->count, tmp,
  				   tmp + RWSEM_ACTIVE_READ_BIAS)) {
  			return 1;
  		}
@@ -121,7 +121,7 @@ index 24cd928..ca64a98 100644
 -	tmp = cmpxchg(&sem->count, RWSEM_UNLOCKED_VALUE,
 +	tmp = cmpxchg((long *)&sem->count, RWSEM_UNLOCKED_VALUE,
  		      RWSEM_ACTIVE_WRITE_BIAS);
- 	return tmp == RWSEM_UNLOCKED_VALUE;
+ 	return tmp = RWSEM_UNLOCKED_VALUE;
  }
 @@ -119,9 +128,9 @@ static inline int __down_write_trylock(struct rw_semaphore *sem)
   */
@@ -132,7 +132,7 @@ index 24cd928..ca64a98 100644
  
 -	tmp = atomic_dec_return((atomic_t *)(&sem->count));
 +	tmp = atomic_long_dec_return(&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 a683e2d..350fe7f 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -17,17 +17,17 @@
   "Subject\00064-bit ppc rwsem (was: Re: [GIT] Sparc)\0"
 ]
 [
-  "Date\0Wed, 18 Aug 2010 14:38:58 +1000\0"
+  "Date\0Wed, 18 Aug 2010 04:38:58 +0000\0"
 ]
 [
   "To\0David Miller <davem\@davemloft.net>\0"
 ]
 [
   "Cc\0torvalds\@linux-foundation.org",
-  " akpm\@linux-foundation.org",
-  " sparclinux\@vger.kernel.org",
-  " linux-kernel\@vger.kernel.org",
   " paulus\@au.ibm.com",
+  " linux-kernel\@vger.kernel.org",
+  " sparclinux\@vger.kernel.org",
+  " akpm\@linux-foundation.org",
   " linuxppc-dev <linuxppc-dev\@lists.ozlabs.org>\0"
 ]
 [
@@ -130,9 +130,9 @@
   "+\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",
   "+\twhile ((tmp = atomic_long_read(&sem->count)) >= 0) {\n",
-  "+\t\tif (tmp == cmpxchg((long *)&sem->count, tmp,\n",
+  "+\t\tif (tmp = cmpxchg((long *)&sem->count, tmp,\n",
   " \t\t\t\t   tmp + RWSEM_ACTIVE_READ_BIAS)) {\n",
   " \t\t\treturn 1;\n",
   " \t\t}\n",
@@ -160,7 +160,7 @@
   "-\ttmp = cmpxchg(&sem->count, RWSEM_UNLOCKED_VALUE,\n",
   "+\ttmp = cmpxchg((long *)&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",
   "\@\@ -119,9 +128,9 \@\@ static inline int __down_write_trylock(struct rw_semaphore *sem)\n",
   "  */\n",
@@ -171,7 +171,7 @@
   " \n",
   "-\ttmp = atomic_dec_return((atomic_t *)(&sem->count));\n",
   "+\ttmp = atomic_long_dec_return(&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",
@@ -228,4 +228,4 @@
   " #endif\t/* __KERNEL__ */"
 ]
 
-e7f18daf6d16da09309496f4c44fd5865a971a4f46ffadfc884380dfa73c199c
+063d2693b1bbc9ef436c875d4468a03d4f0df60432d09b62d296fc3de6cb51d2
