]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
[PATCH] powerpc: merge atomic.h, memory.h
authorBecky Bruce <bgill@freescale.com>
Thu, 22 Sep 2005 19:20:04 +0000 (14:20 -0500)
committerPaul Mackerras <paulus@samba.org>
Sun, 25 Sep 2005 12:38:46 +0000 (22:38 +1000)
commitfeaf7cf153335fe7100b65ed6f4585c3574fe69a
treec57198f01b5f12ffe8ce90f4e1399505c1f84a02
parent2bfadee32f1501faa3184d574f6a769f17236c87
[PATCH] powerpc: merge atomic.h, memory.h

powerpc: Merge atomic.h and memory.h into powerpc

Merged atomic.h into include/powerpc.  Moved asm-style HMT_ defines from
memory.h into ppc_asm.h, where there were already HMT_defines; moved c-style
HMT_ defines to processor.h. Renamed memory.h to synch.h to better reflect
its contents.

Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Becky Bruce <becky.bruce@freescale.com>
Signed-off-by: Jon Loeliger <linuxppc@jdl.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
include/asm-powerpc/atomic.h [moved from include/asm-ppc/atomic.h with 85% similarity]
include/asm-powerpc/ppc_asm.h
include/asm-powerpc/synch.h [new file with mode: 0644]
include/asm-ppc/io.h
include/asm-ppc64/atomic.h [deleted file]
include/asm-ppc64/bitops.h
include/asm-ppc64/futex.h
include/asm-ppc64/io.h
include/asm-ppc64/memory.h [deleted file]
include/asm-ppc64/processor.h
include/asm-ppc64/system.h