# Pastebin 6YqSblJO
@@ -566,11 +491,14 @@ ENDPROC(__und_usr)
  * IRQs enabled, FIQs enabled.
  */
-       @
-       @ Fall-through from Thumb-2 __und_usr
-       @
 call_fpe:
+       mov     r2, r4
+       sub     r4, r4, #4                      @ ARM instruction at user PC - 4
+USERL( 4b,     ldrt r0, [r4])                  @ load opcode from user space
+ARM_BE8(rev    r0, r0)                         @ little endian instruction
+
+       uaccess_disable ip
+
        get_thread_info r10                     @ get current thread
        tst     r0, #0x08000000                 @ only CDP/CPRT/LDC/STC have bit 27
-       tstne   r0, #0x04000000                 @ bit 26 set on both ARM and Thumb-2
        reteq   lr
        and     r8, r0, #0x00000f00             @ mask out CP number