diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-07 07:30:20 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-07 07:42:17 -0500 |
| commit | 237c78beb8a988453bac1993d21f025d070a0d8d (patch) | |
| tree | 9864f0924650770881141359a2d5bac623949789 /arch/arm/include/asm/assembler.h | |
| parent | 4eb821999086417ab42a15174b51497122fc406e (diff) | |
| parent | 7b9dd47136c07ffd883aff6926c7b281e4c1eea4 (diff) | |
Merge branch 'depends/rmk/for-linus' into samsung/dt
Conflicts:
arch/arm/mach-exynos/Makefile
arch/arm/mach-exynos/cpu.c -> common.c
arch/arm/mach-exynos/include/mach/entry-macro.S
arch/arm/mach-exynos/init.c -> common.c
arch/arm/mach-s5p64x0/init.c -> common.c
arch/arm/mach-s5pv210/init.c -> common.c
Multiple files were moved into common.c files in the rmk/for-linus
branch, so this moves over the samsung/dt changes to the new
files.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/include/asm/assembler.h')
| -rw-r--r-- | arch/arm/include/asm/assembler.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h index 29035e86a59..b6e65dedfd7 100644 --- a/arch/arm/include/asm/assembler.h +++ b/arch/arm/include/asm/assembler.h | |||
| @@ -187,6 +187,17 @@ | |||
| 187 | #endif | 187 | #endif |
| 188 | 188 | ||
| 189 | /* | 189 | /* |
| 190 | * Instruction barrier | ||
| 191 | */ | ||
| 192 | .macro instr_sync | ||
| 193 | #if __LINUX_ARM_ARCH__ >= 7 | ||
| 194 | isb | ||
| 195 | #elif __LINUX_ARM_ARCH__ == 6 | ||
| 196 | mcr p15, 0, r0, c7, c5, 4 | ||
| 197 | #endif | ||
| 198 | .endm | ||
| 199 | |||
| 200 | /* | ||
| 190 | * SMP data memory barrier | 201 | * SMP data memory barrier |
| 191 | */ | 202 | */ |
| 192 | .macro smp_dmb mode | 203 | .macro smp_dmb mode |