asm-generic: rwsem: de-PPCify rwsem.h
PATCH 1/1 asm-generic: rwsem: de-PPCify rwsem.h
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.
---
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(-)
include/asm-generic/rwsem.h +5 -5
@@ -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 <[email protected]>. */
@@ -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 */
Signature · 1 line
1.8.2.2
Quoted 11 lines · Will Deacon
asm-generic/rwsem.hused to live underarch/powerpc. During its liberation to common code, a few references to its former home where preserved, in particular the definition ofRWSEM_ACTIVE_MASKis predicated onCONFIG_PPC64.This patch updates the ifdefs and comments to architecturally neutral versions.
Cc Arnd Bergmann <[email protected]>Acked-by Richard Kuo <[email protected]>Signed-off-by Will Deacon <[email protected]>
Quoted 7 lines
---
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.
I don't expect any conflicts, so just put it in the arm64 tree along with the patch to use it.
Arnd