[PATCH] asm-generic: rwsem: de-PPCify rwsem.h

[PATCH] asm-generic: rwsem: de-PPCify rwsem.h

[Will Deacon]

asm-generic/rwsem.h used to live under arch/powerpc. During its
liberation to common code, a few references to its former home where
preserved, in particular the definition of RWSEM_ACTIVE_MASK is
predicated on CONFIG_PPC64.

This patch updates the ifdefs and comments to architecturally neutral
versions.

Cc: Arnd Bergmann <arnd@arndb.de>
Acked-by: Richard Kuo <rkuo@codeaurora.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---

Hi Arnd,

Any chance you could queue this for 3.15 please? It means I can easily
move arm64 over to the asm-generic rwsem implementation afterwards.

Cheers,

Will

 include/asm-generic/rwsem.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/asm-generic/rwsem.h b/include/asm-generic/rwsem.h
index bb1e2cdeb9bf..d48bf5a95cc1 100644
--- a/include/asm-generic/rwsem.h
+++ b/include/asm-generic/rwsem.h
@@ -1,5 +1,5 @@
-#ifndef _ASM_POWERPC_RWSEM_H
-#define _ASM_POWERPC_RWSEM_H
+#ifndef _ASM_GENERIC_RWSEM_H
+#define _ASM_GENERIC_RWSEM_H
 
 #ifndef _LINUX_RWSEM_H
 #error "Please don't include <asm/rwsem.h> directly, use <linux/rwsem.h> instead."
@@ -8,7 +8,7 @@
 #ifdef __KERNEL__
 
 /*
- * R/W semaphores for PPC using the stuff in lib/rwsem.c.
+ * R/W semaphores originally for PPC using the stuff in lib/rwsem.c.
  * Adapted largely from include/asm-i386/rwsem.h
  * by Paul Mackerras <paulus@samba.org>.
  */
@@ -16,7 +16,7 @@
 /*
  * the semaphore definition
  */
-#ifdef CONFIG_PPC64
+#ifdef CONFIG_64BIT
 # define RWSEM_ACTIVE_MASK		0xffffffffL
 #else
 # define RWSEM_ACTIVE_MASK		0x0000ffffL
@@ -129,4 +129,4 @@ static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem)
 }
 
 #endif	/* __KERNEL__ */
-#endif	/* _ASM_POWERPC_RWSEM_H */
+#endif	/* _ASM_GENERIC_RWSEM_H */
-- 
1.8.2.2

Re: [PATCH] asm-generic: rwsem: de-PPCify rwsem.h

[Arnd Bergmann]

On Friday 07 March 2014, Will Deacon wrote:
> asm-generic/rwsem.h used to live under arch/powerpc. During its
> liberation to common code, a few references to its former home where
> preserved, in particular the definition of RWSEM_ACTIVE_MASK is
> predicated on CONFIG_PPC64.
> 
> This patch updates the ifdefs and comments to architecturally neutral
> versions.
> 
> Cc: Arnd Bergmann <arnd@arndb.de>
> Acked-by: Richard Kuo <rkuo@codeaurora.org>
> Signed-off-by: Will Deacon <will.deacon@arm.com>
> ---
> 
> Hi Arnd,
> 
> Any chance you could queue this for 3.15 please? It means I can easily
> move arm64 over to the asm-generic rwsem implementation afterwards.
> 

Acked-by: Arnd Bergmann <arnd@arndb.de>

I don't expect any conflicts, so just put it in the arm64 tree along with
the patch to use it.

	Arnd