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>
mariux64 · Jun 2, 2014 · 175352a · 175352a
1 parent b4b20ad
commit 175352a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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)
 {