ARM: move "noalign" command line option to alignment.c

Keep all bits of alignment handling together.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c
index 53e268fcae45e0bcd6e06cbc78d405882818251d..4cfefa20ee983a76b37256321c9ed495b966add7 100644 (file)
--- 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 d97cb2d8953a9b839260f7e3368b1c6c4479f06d..ec57f792aed4589127f698d5154e227ed227aa0a 100644 (file)
--- 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)
 {