From 175352a51cfc275b8590d27be6fdd4b14f416c32 Mon Sep 17 00:00:00 2001 From: Russell King Date: Sun, 13 Apr 2014 19:00:17 +0100 Subject: [PATCH] ARM: move "noalign" command line option to alignment.c Keep all bits of alignment handling together. Signed-off-by: Russell King --- arch/arm/mm/alignment.c | 7 +++++++ arch/arm/mm/mmu.c | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c index 53e268fcae45..4cfefa20ee98 100644 --- a/arch/arm/mm/alignment.c +++ b/arch/arm/mm/alignment.c @@ -950,6 +950,13 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs) return 0; } +static int __init noalign_setup(char *__unused) +{ + set_cr(__clear_cr(CR_A)); + return 1; +} +__setup("noalign", noalign_setup); + /* * This needs to be done after sysctl_init, otherwise sys/ will be * overwritten. Actually, this shouldn't be in sys/ at all since diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index d97cb2d8953a..ec57f792aed4 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -186,13 +186,6 @@ static int __init early_ecc(char *p) early_param("ecc", early_ecc); #endif -static int __init noalign_setup(char *__unused) -{ - set_cr(__clear_cr(CR_A)); - return 1; -} -__setup("noalign", noalign_setup); - #ifndef CONFIG_SMP void adjust_cr(unsigned long mask, unsigned long set) {