diff options
| author | Becky Bruce <bgill@freescale.com> | 2005-09-22 14:20:04 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-09-25 22:38:46 +1000 |
| commit | feaf7cf153335fe7100b65ed6f4585c3574fe69a (patch) | |
| tree | c57198f01b5f12ffe8ce90f4e1399505c1f84a02 /include/asm-ppc64/system.h | |
| parent | 2bfadee32f1501faa3184d574f6a769f17236c87 (diff) | |
[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>
Diffstat (limited to 'include/asm-ppc64/system.h')
| -rw-r--r-- | include/asm-ppc64/system.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-ppc64/system.h b/include/asm-ppc64/system.h index 375015c62f2..1fbdc9f0590 100644 --- a/include/asm-ppc64/system.h +++ b/include/asm-ppc64/system.h @@ -13,7 +13,7 @@ #include <asm/page.h> #include <asm/processor.h> #include <asm/hw_irq.h> -#include <asm/memory.h> +#include <asm/synch.h> /* * Memory barrier. @@ -48,7 +48,7 @@ #ifdef CONFIG_SMP #define smp_mb() mb() #define smp_rmb() rmb() -#define smp_wmb() __asm__ __volatile__ ("eieio" : : : "memory") +#define smp_wmb() eieio() #define smp_read_barrier_depends() read_barrier_depends() #else #define smp_mb() __asm__ __volatile__("": : :"memory") |