diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-11 05:55:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-11 05:55:04 -0400 |
| commit | a0f0dd57f4a85310d9936f1770a0424b49fef876 (patch) | |
| tree | 2f85b8b67dda13d19b02ca39e0fbef921cb1cf8b /arch/arm/mm/cache-v7.S | |
| parent | 2a552d5e63d7fa602c9a9a0717008737f55625a6 (diff) | |
| parent | 846a136881b8f73c1f74250bf6acfaa309cab1f2 (diff) | |
Merge branch 'fixes' into for-linus
Conflicts:
arch/arm/kernel/smp.c
Diffstat (limited to 'arch/arm/mm/cache-v7.S')
| -rw-r--r-- | arch/arm/mm/cache-v7.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mm/cache-v7.S b/arch/arm/mm/cache-v7.S index 140b294bbd9b..cd956647c21a 100644 --- a/arch/arm/mm/cache-v7.S +++ b/arch/arm/mm/cache-v7.S | |||
| @@ -247,6 +247,9 @@ ENTRY(v7_coherent_user_range) | |||
| 247 | * isn't mapped, fail with -EFAULT. | 247 | * isn't mapped, fail with -EFAULT. |
| 248 | */ | 248 | */ |
| 249 | 9001: | 249 | 9001: |
| 250 | #ifdef CONFIG_ARM_ERRATA_775420 | ||
| 251 | dsb | ||
| 252 | #endif | ||
| 250 | mov r0, #-EFAULT | 253 | mov r0, #-EFAULT |
| 251 | mov pc, lr | 254 | mov pc, lr |
| 252 | UNWIND(.fnend ) | 255 | UNWIND(.fnend ) |