diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-26 23:10:11 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-26 23:10:11 +0000 |
| commit | 542f869f1826f092606efd0c4c771f070d1314f5 (patch) | |
| tree | 9c9d265ab0c87ea7862ccb70933f33d3d7011334 /arch/arm/include/asm/system.h | |
| parent | e8b374bb6c888a70530d800c9e2fcd153e2c325d (diff) | |
| parent | 839e642f3dda44a35c6a91780bff41d84c288022 (diff) | |
| download | linux-542f869f1826f092606efd0c4c771f070d1314f5.tar.gz linux-542f869f1826f092606efd0c4c771f070d1314f5.tar.bz2 linux-542f869f1826f092606efd0c4c771f070d1314f5.zip | |
Merge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline into devel
Conflicts:
arch/arm/mm/Kconfig
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/include/asm/system.h')
| -rw-r--r-- | arch/arm/include/asm/system.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/include/asm/system.h b/arch/arm/include/asm/system.h index 0a0d49ae1e6d..bd4dc8ed53d5 100644 --- a/arch/arm/include/asm/system.h +++ b/arch/arm/include/asm/system.h @@ -125,6 +125,12 @@ extern unsigned int user_debug; : : "r" (0) : "memory") #define dmb() __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 5" \ : : "r" (0) : "memory") +#elif defined(CONFIG_CPU_FA526) +#define isb() __asm__ __volatile__ ("mcr p15, 0, %0, c7, c5, 4" \ + : : "r" (0) : "memory") +#define dsb() __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 4" \ + : : "r" (0) : "memory") +#define dmb() __asm__ __volatile__ ("" : : : "memory") #else #define isb() __asm__ __volatile__ ("" : : : "memory") #define dsb() __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 4" \ |