[PATCH] powerpc: merge semaphore.h
authorBecky Bruce <bgill@freescale.com>
Fri, 23 Sep 2005 16:07:36 +0000 (11:07 -0500)
committerPaul Mackerras <paulus@samba.org>
Sun, 25 Sep 2005 12:38:46 +0000 (22:38 +1000)
commitd6a4c847e43c851cc0ddf73087a730227223f989
tree4f1991e81f8c87296222145e456a682a41d6be8e
parent342e73b3d6fd1321d1eaaa6a935f267a300ceebd
[PATCH] powerpc: merge semaphore.h

powerpc: Merge semaphore.h

Adopted the ppc64 version of semaphore.h.  The 32-bit version used
smp_wmb(), but recent updates to atomic.h mean this is no longer required.
The 64-bit version made use of unlikely(), which has been retained in the
combined version.

This patch requires the recent atomic.h patch.

Signed-off-by: Becky Bruce <becky.bruce@freescale.com>
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
include/asm-powerpc/semaphore.h [moved from include/asm-ppc64/semaphore.h with 95% similarity]
include/asm-ppc/semaphore.h [deleted file]