diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 17:45:51 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 17:45:51 -0500 |
| commit | e5570bbc9c06634cfac94e06ac1432b53d8595e5 (patch) | |
| tree | bfaf6b5ddedaa03d31400b25b25cfaa3bd0c9107 /arch/arm/include/asm/assembler.h | |
| parent | 5611cc4572e889b62a7b4c72a413536bf6a9c416 (diff) | |
| parent | 6cc04a4420391c3f034afe8ea6e28d75912a70a3 (diff) | |
Merge branch 'for-3.3/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into tegra/soc
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 29035e86a59d..b6e65dedfd71 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 |