diff options
| author | roy zang <tie-fei.zang@freescale.com> | 2007-02-28 16:46:48 +0800 |
|---|---|---|
| committer | Zang Tiefei <roy@bus.ap.freescale.net> | 2007-02-28 16:46:48 +0800 |
| commit | 00b574bdc8c54dbc9e03f63c24f62955d483e3ef (patch) | |
| tree | dc49c4219bafd43c2ace6c5a3e6745d7b7264194 /include/asm-ppc/io.h | |
| parent | 30bddf2c46ab2e824f217a38db033118ac4622af (diff) | |
| parent | ccbc7036648e465697ca298ba51e0e76dda352a0 (diff) | |
| download | u-boot-imx-00b574bdc8c54dbc9e03f63c24f62955d483e3ef.zip u-boot-imx-00b574bdc8c54dbc9e03f63c24f62955d483e3ef.tar.gz u-boot-imx-00b574bdc8c54dbc9e03f63c24f62955d483e3ef.tar.bz2 | |
Merge branch 'master' into hpc2
Conflicts:
drivers/Makefile
Fix the merge conflict in file drivers/Makefile
Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
Diffstat (limited to 'include/asm-ppc/io.h')
| -rw-r--r-- | include/asm-ppc/io.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/include/asm-ppc/io.h b/include/asm-ppc/io.h index 8e5fe11..bbc9ba0 100644 --- a/include/asm-ppc/io.h +++ b/include/asm-ppc/io.h @@ -95,8 +95,15 @@ extern void _outsl_ns(volatile u32 *port, const void *buf, int nl); * Acts as a barrier to ensure all previous I/O accesses have * completed before any further ones are issued. */ -#define eieio() __asm__ __volatile__ ("eieio" : : : "memory"); -#define sync() __asm__ __volatile__ ("sync" : : : "memory"); +static inline void eieio(void) +{ + __asm__ __volatile__ ("eieio" : : : "memory"); +} + +static inline void sync(void) +{ + __asm__ __volatile__ ("sync" : : : "memory"); +} /* Enforce in-order execution of data I/O. * No distinction between read/write on PPC; use eieio for all three. |