diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2005-11-02 05:58:22 +0300 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-02 06:48:18 +0300 |
| commit | 2ff2ae7a0d7bfd813325663dc6353d034db7473d (patch) | |
| tree | 293cfb483a6dde5dd22cb1711f4abf2542da6182 /include/asm-powerpc/ppc_asm.h | |
| parent | 847aeb6bad0876ff9c250725e905a41c6050157c (diff) | |
| download | linux-2ff2ae7a0d7bfd813325663dc6353d034db7473d.tar.xz | |
[PATCH] powerpc: Merge futex.h
This patch merges the ppc32 and ppc64 versions of futex.h, essentially
by taking the ppc64 version as the powerpc version. The old ppc32
version did not implement the futex_atomic_op_inuser() callback (it
always returned -ENOSYS), so FUTEX_WAKE_OP would not work on ppc32.
In fact the ppc64 version of this function is almost suitable for
ppc32 as well - the only change needed is to extend ppc_asm.h with a
macro expanding to to the right pseudo-op to store a pointer (either
".long" or ".llong").
Built and booted on pSeries. Built for 32-bit powermac.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-powerpc/ppc_asm.h')
| -rw-r--r-- | include/asm-powerpc/ppc_asm.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/asm-powerpc/ppc_asm.h b/include/asm-powerpc/ppc_asm.h index f99f2af82ca5..c534ca41224b 100644 --- a/include/asm-powerpc/ppc_asm.h +++ b/include/asm-powerpc/ppc_asm.h @@ -506,6 +506,13 @@ END_FTR_SECTION_IFCLR(CPU_FTR_601) #else #define __ASM_CONST(x) x##UL #define ASM_CONST(x) __ASM_CONST(x) + +#ifdef CONFIG_PPC64 +#define DATAL ".llong" +#else +#define DATAL ".long" +#endif + #endif /* __ASSEMBLY__ */ #endif /* _ASM_POWERPC_PPC_ASM_H */ |