From 0aeb3408ca9773283b0ae63771c4b17f39e204df Mon Sep 17 00:00:00 2001 From: Russell King Date: Sun, 13 Apr 2014 19:43:26 +0100 Subject: [PATCH] ARM: remove global cr_no_alignment cr_no_alignment is really only used by the alignment code. Since we no longer change the setting of cr_alignment after boot, we can localise this to alignment.c Signed-off-by: Russell King --- arch/arm/include/asm/cp15.h | 8 +++----- arch/arm/kernel/entry-armv.S | 3 --- arch/arm/kernel/head-common.S | 3 +-- arch/arm/mm/alignment.c | 3 +++ arch/arm/mm/init.c | 1 - 5 files changed, 7 insertions(+), 11 deletions(-) diff --git a/arch/arm/include/asm/cp15.h b/arch/arm/include/asm/cp15.h index ebae45d7f017..c3f11524f10c 100644 --- a/arch/arm/include/asm/cp15.h +++ b/arch/arm/include/asm/cp15.h @@ -49,7 +49,6 @@ #ifdef CONFIG_CPU_CP15 -extern unsigned long cr_no_alignment; /* defined in entry-armv.S */ extern unsigned long cr_alignment; /* defined in entry-armv.S */ static inline unsigned long get_cr(void) @@ -102,11 +101,10 @@ static inline void set_copro_access(unsigned int val) #else /* ifdef CONFIG_CPU_CP15 */ /* - * cr_alignment and cr_no_alignment are tightly coupled to cp15 (at least in the - * minds of the developers). Yielding 0 for machines without a cp15 (and making - * it read-only) is fine for most cases and saves quite some #ifdeffery. + * cr_alignment is tightly coupled to cp15 (at least in the minds of the + * developers). Yielding 0 for machines without a cp15 (and making it + * read-only) is fine for most cases and saves quite some #ifdeffery. */ -#define cr_no_alignment UL(0) #define cr_alignment UL(0) static inline unsigned long get_cr(void) diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 1879e8dd2acc..cac5b88216e6 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -1143,11 +1143,8 @@ __vectors_start: .data .globl cr_alignment - .globl cr_no_alignment cr_alignment: .space 4 -cr_no_alignment: - .space 4 #ifdef CONFIG_MULTI_IRQ_HANDLER .globl handle_arch_irq diff --git a/arch/arm/kernel/head-common.S b/arch/arm/kernel/head-common.S index c96ecacb2021..572a38335c96 100644 --- a/arch/arm/kernel/head-common.S +++ b/arch/arm/kernel/head-common.S @@ -99,8 +99,7 @@ __mmap_switched: str r1, [r5] @ Save machine type str r2, [r6] @ Save atags pointer cmp r7, #0 - bicne r4, r0, #CR_A @ Clear 'A' bit - stmneia r7, {r0, r4} @ Save control register values + strne r0, [r7] @ Save control register values b start_kernel ENDPROC(__mmap_switched) diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c index 054e995d2f5b..b8cb1a2688a0 100644 --- a/arch/arm/mm/alignment.c +++ b/arch/arm/mm/alignment.c @@ -82,6 +82,7 @@ static unsigned long ai_word; static unsigned long ai_dword; static unsigned long ai_multi; static int ai_usermode; +static unsigned long cr_no_alignment; core_param(alignment, ai_usermode, int, 0600); @@ -979,6 +980,8 @@ static int __init alignment_init(void) ai_usermode = safe_usermode(ai_usermode, false); } + cr_no_alignment = get_cr() & ~CR_A; + hook_fault_code(FAULT_CODE_ALIGNMENT, do_alignment, SIGBUS, BUS_ADRALN, "alignment exception"); diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 94332b1ad4bc..13ce33e096b5 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -40,7 +40,6 @@ #ifdef CONFIG_CPU_CP15_MMU unsigned long __init __clear_cr(unsigned long mask) { - cr_no_alignment = cr_no_alignment & ~mask; cr_alignment = cr_alignment & ~mask; return cr_alignment; } -- 2.20.1