1 files changed, 13 insertions, 6 deletions

diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c
index 924036473b16..b8cb1a2688a0 100644
--- a/arch/arm/mm/alignment.c
+++ b/arch/arm/mm/alignment.c
@@ -28,6 +28,7 @@
 #include <asm/opcodes.h>
 
 #include "fault.h"
+#include "mm.h"
 
 /*
  * 32-bit misaligned trap handler (c) 1998 San Mehat (CCC) -July 1998
@@ -81,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);
 
@@ -91,7 +93,7 @@ core_param(alignment, ai_usermode, int, 0600);
 /* Return true if and only if the ARMv6 unaligned access model is in use. */
 static bool cpu_is_v6_unaligned(void)
 {
-        return cpu_architecture() >= CPU_ARCH_ARMv6 && (cr_alignment & CR_U);
+        return cpu_architecture() >= CPU_ARCH_ARMv6 && get_cr() & CR_U;
 }
 
 static int safe_usermode(int new_usermode, bool warn)
@@ -949,6 +951,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
@@ -966,14 +975,12 @@ static int __init alignment_init(void)
                 return -ENOMEM;
 #endif
 
-#ifdef CONFIG_CPU_CP15
         if (cpu_is_v6_unaligned()) {
-                cr_alignment &= ~CR_A;
-                cr_no_alignment &= ~CR_A;
-                set_cr(cr_alignment);
+                set_cr(__clear_cr(CR_A));
                 ai_usermode = safe_usermode(ai_usermode, false);
         }
-#endif
+
+        cr_no_alignment = get_cr() & ~CR_A;
 
         hook_fault_code(FAULT_CODE_ALIGNMENT, do_alignment, SIGBUS, BUS_ADRALN,
                         "alignment exception");