diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-05-25 12:53:19 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-05-25 12:53:19 +0400 |
| commit | 256e5d8c3f7bae348b2115e0323ef9e836eb4d47 (patch) | |
| tree | 354d0743226588e414e0d2a917418b3eb904695f /arch/arm/mm/alignment.c | |
| parent | b068b1e7d514d8806623ece2fc76aacf523f487d (diff) | |
| parent | 2be12549c900303c418fcbb7044979e190fd4e7e (diff) | |
Merge remote-tracking branch 'nico/iks' into lsk-3.9-vexpress-iks
Conflicts:
arch/arm/Kconfig
arch/arm/common/Makefile
Diffstat (limited to 'arch/arm/mm/alignment.c')
| -rw-r--r-- | arch/arm/mm/alignment.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c index db26e2e543f..6f4585b8907 100644 --- a/arch/arm/mm/alignment.c +++ b/arch/arm/mm/alignment.c @@ -961,12 +961,14 @@ static int __init alignment_init(void) return -ENOMEM; #endif +#ifdef CONFIG_CPU_CP15 if (cpu_is_v6_unaligned()) { cr_alignment &= ~CR_A; cr_no_alignment &= ~CR_A; set_cr(cr_alignment); ai_usermode = safe_usermode(ai_usermode, false); } +#endif hook_fault_code(FAULT_CODE_ALIGNMENT, do_alignment, SIGBUS, BUS_ADRALN, "alignment exception"); |