Commit e172800e authored by Will Deacon's avatar Will Deacon Committed by Catalin Marinas

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.
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarRichard Kuo <rkuo@codeaurora.org>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 3be1a5c4
#ifndef _ASM_POWERPC_RWSEM_H #ifndef _ASM_GENERIC_RWSEM_H
#define _ASM_POWERPC_RWSEM_H #define _ASM_GENERIC_RWSEM_H
#ifndef _LINUX_RWSEM_H #ifndef _LINUX_RWSEM_H
#error "Please don't include <asm/rwsem.h> directly, use <linux/rwsem.h> instead." #error "Please don't include <asm/rwsem.h> directly, use <linux/rwsem.h> instead."
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#ifdef __KERNEL__ #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 * Adapted largely from include/asm-i386/rwsem.h
* by Paul Mackerras <paulus@samba.org>. * by Paul Mackerras <paulus@samba.org>.
*/ */
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
/* /*
* the semaphore definition * the semaphore definition
*/ */
#ifdef CONFIG_PPC64 #ifdef CONFIG_64BIT
# define RWSEM_ACTIVE_MASK 0xffffffffL # define RWSEM_ACTIVE_MASK 0xffffffffL
#else #else
# define RWSEM_ACTIVE_MASK 0x0000ffffL # define RWSEM_ACTIVE_MASK 0x0000ffffL
...@@ -129,4 +129,4 @@ static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem) ...@@ -129,4 +129,4 @@ static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem)
} }
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_RWSEM_H */ #endif /* _ASM_GENERIC_RWSEM_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment