]> err.no Git - linux-2.6/commit
[PATCH] powerpc: Merge futex.h
authorDavid Gibson <david@gibson.dropbear.id.au>
Wed, 2 Nov 2005 02:58:22 +0000 (13:58 +1100)
committerPaul Mackerras <paulus@samba.org>
Wed, 2 Nov 2005 03:48:18 +0000 (14:48 +1100)
commit2ff2ae7a0d7bfd813325663dc6353d034db7473d
tree293cfb483a6dde5dd22cb1711f4abf2542da6182
parent847aeb6bad0876ff9c250725e905a41c6050157c
[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>
include/asm-powerpc/futex.h [moved from include/asm-ppc64/futex.h with 71% similarity]
include/asm-powerpc/ppc_asm.h
include/asm-ppc/futex.h [deleted file]