iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: remove global cr_no_alignment

Browse Source 
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 <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2014-04-13 19:43:26 +01:00
parent 3cb099f089
commit 0aeb3408ca
5 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/include/asm/cp15.h
View File

@ -49,7 +49,6 @@
#ifdef CONFIG_CPU_CP15 #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 */ extern unsigned long cr_alignment; /* defined in entry-armv.S */
static inline unsigned long get_cr(void) 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 */ #else /* ifdef CONFIG_CPU_CP15 */
/* /*
* cr_alignment and cr_no_alignment are tightly coupled to cp15 (at least in the * cr_alignment is tightly coupled to cp15 (at least in the minds of the
* minds of the developers). Yielding 0 for machines without a cp15 (and making * developers). Yielding 0 for machines without a cp15 (and making it
* it read-only) is fine for most cases and saves quite some #ifdeffery. * read-only) is fine for most cases and saves quite some #ifdeffery.
*/ */
#define cr_no_alignment UL(0)
#define cr_alignment UL(0) #define cr_alignment UL(0)
static inline unsigned long get_cr(void) static inline unsigned long get_cr(void)

3
arch/arm/kernel/entry-armv.S
View File

@ -1143,11 +1143,8 @@ __vectors_start:
.data .data
.globl cr_alignment .globl cr_alignment
.globl cr_no_alignment
cr_alignment: cr_alignment:
.space 4 .space 4
cr_no_alignment:
.space 4
#ifdef CONFIG_MULTI_IRQ_HANDLER #ifdef CONFIG_MULTI_IRQ_HANDLER
.globl handle_arch_irq .globl handle_arch_irq

3
arch/arm/kernel/head-common.S
View File

@ -99,8 +99,7 @@ __mmap_switched:
str r1, [r5] @ Save machine type str r1, [r5] @ Save machine type
str r2, [r6] @ Save atags pointer str r2, [r6] @ Save atags pointer
cmp r7, #0 cmp r7, #0
bicne r4, r0, #CR_A @ Clear 'A' bit strne r0, [r7] @ Save control register values
stmneia r7, {r0, r4} @ Save control register values
b start_kernel b start_kernel
ENDPROC(__mmap_switched) ENDPROC(__mmap_switched)

3
arch/arm/mm/alignment.c
View File

@ -82,6 +82,7 @@ static unsigned long ai_word;
static unsigned long ai_dword; static unsigned long ai_dword;
static unsigned long ai_multi; static unsigned long ai_multi;
static int ai_usermode; static int ai_usermode;
static unsigned long cr_no_alignment;
core_param(alignment, ai_usermode, int, 0600); core_param(alignment, ai_usermode, int, 0600);
@ -979,6 +980,8 @@ static int __init alignment_init(void)
ai_usermode = safe_usermode(ai_usermode, false); 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, hook_fault_code(FAULT_CODE_ALIGNMENT, do_alignment, SIGBUS, BUS_ADRALN,
"alignment exception"); "alignment exception");

1
arch/arm/mm/init.c
View File

@ -40,7 +40,6 @@
#ifdef CONFIG_CPU_CP15_MMU #ifdef CONFIG_CPU_CP15_MMU
unsigned long __init __clear_cr(unsigned long mask) unsigned long __init __clear_cr(unsigned long mask)
{ {
cr_no_alignment = cr_no_alignment & ~mask;
cr_alignment = cr_alignment & ~mask; cr_alignment = cr_alignment & ~mask;
return cr_alignment; return cr_alignment;
} }