From f3209e03263a090ec717d370446e0baf15b21a38 Mon Sep 17 00:00:00 2001 From: Grazvydas Ignotas Date: Sun, 3 Nov 2013 23:19:41 +0200 Subject: [PATCH] ARM: avoid alignment related control reg writeouts Always writing out the same value on ARMv7, no need to.. --- arch/arm/kernel/entry-common.S | 4 ++-- arch/arm/kernel/entry-header.S | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index b2a27b6b0046..1df038093957 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -405,7 +405,7 @@ ENTRY(vector_swi) #endif -#ifdef CONFIG_ALIGNMENT_TRAP +#if defined(CONFIG_ALIGNMENT_TRAP) && __LINUX_ARM_ARCH__ < 7 ldr ip, __cr_alignment ldr ip, [ip] mcr p15, 0, ip, c1, c0 @ update control register @@ -485,7 +485,7 @@ __sys_trace_return: b ret_slow_syscall .align 5 -#ifdef CONFIG_ALIGNMENT_TRAP +#if defined(CONFIG_ALIGNMENT_TRAP) && __LINUX_ARM_ARCH__ < 7 .type __cr_alignment, #object __cr_alignment: .word cr_alignment diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S index 9a8531eadd3d..5413334eae02 100644 --- a/arch/arm/kernel/entry-header.S +++ b/arch/arm/kernel/entry-header.S @@ -37,7 +37,7 @@ .endm .macro alignment_trap, rtemp -#ifdef CONFIG_ALIGNMENT_TRAP +#if defined(CONFIG_ALIGNMENT_TRAP) && __LINUX_ARM_ARCH__ < 7 ldr \rtemp, .LCcralign ldr \rtemp, [\rtemp] mcr p15, 0, \rtemp, c1, c0 -- 2.39.2