diff options
author | Will Deacon <will.deacon@arm.com> | 2014-03-14 13:47:04 -0400 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2014-03-14 14:02:08 -0400 |
commit | e172800e5d3162f97d332b3745e3743ce150ec48 (patch) | |
tree | 521ff01d84e306c7af465769c0a8f6feee0b9846 | |
parent | 3be1a5c4f75989cf457f13f38ff0913dff6d4996 (diff) |
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: Arnd Bergmann <arnd@arndb.de>
Acked-by: Richard Kuo <rkuo@codeaurora.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
-rw-r--r-- | include/asm-generic/rwsem.h | 10 |
1 files 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 @@ | |||
1 | #ifndef _ASM_POWERPC_RWSEM_H | 1 | #ifndef _ASM_GENERIC_RWSEM_H |
2 | #define _ASM_POWERPC_RWSEM_H | 2 | #define _ASM_GENERIC_RWSEM_H |
3 | 3 | ||
4 | #ifndef _LINUX_RWSEM_H | 4 | #ifndef _LINUX_RWSEM_H |
5 | #error "Please don't include <asm/rwsem.h> directly, use <linux/rwsem.h> instead." | 5 | #error "Please don't include <asm/rwsem.h> directly, use <linux/rwsem.h> instead." |
@@ -8,7 +8,7 @@ | |||
8 | #ifdef __KERNEL__ | 8 | #ifdef __KERNEL__ |
9 | 9 | ||
10 | /* | 10 | /* |
11 | * R/W semaphores for PPC using the stuff in lib/rwsem.c. | 11 | * R/W semaphores originally for PPC using the stuff in lib/rwsem.c. |
12 | * Adapted largely from include/asm-i386/rwsem.h | 12 | * Adapted largely from include/asm-i386/rwsem.h |
13 | * by Paul Mackerras <paulus@samba.org>. | 13 | * by Paul Mackerras <paulus@samba.org>. |
14 | */ | 14 | */ |
@@ -16,7 +16,7 @@ | |||
16 | /* | 16 | /* |
17 | * the semaphore definition | 17 | * the semaphore definition |
18 | */ | 18 | */ |
19 | #ifdef CONFIG_PPC64 | 19 | #ifdef CONFIG_64BIT |
20 | # define RWSEM_ACTIVE_MASK 0xffffffffL | 20 | # define RWSEM_ACTIVE_MASK 0xffffffffL |
21 | #else | 21 | #else |
22 | # define RWSEM_ACTIVE_MASK 0x0000ffffL | 22 | # define RWSEM_ACTIVE_MASK 0x0000ffffL |
@@ -129,4 +129,4 @@ static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem) | |||
129 | } | 129 | } |
130 | 130 | ||
131 | #endif /* __KERNEL__ */ | 131 | #endif /* __KERNEL__ */ |
132 | #endif /* _ASM_POWERPC_RWSEM_H */ | 132 | #endif /* _ASM_GENERIC_RWSEM_H */ |