Merge tag 'arc-v3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc

Pull ARC changes from Vineet Gupta:

 - ARC MM changes:
    - preparation for MMUv4 (accomodate new PTE bits, new cmds)
    - Rework the ASID allocation algorithm to remove asid-mm reverse map
 - Boilerplate code consolidation in Exception Handlers
 - Disable FRAME_POINTER for ARC
 - Unaligned Access Emulation for Big-Endian from Noam
 - Bunch of fixes (udelay, missing accessors) from Mischa

* tag 'arc-v3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARC: fix new Section mismatches in build (post __cpuinit cleanup)
  Kconfig.debug: Add FRAME_POINTER anti-dependency for ARC
  ARC: Fix __udelay calculation
  ARC: remove console_verbose() from setup_arch()
  ARC: Add read*_relaxed to asm/io.h
  ARC: Handle un-aligned user space access in BE.
  ARC: [ASID] Track ASID allocation cycles/generations
  ARC: [ASID] activate_mm() == switch_mm()
  ARC: [ASID] get_new_mmu_context() to conditionally allocate new ASID
  ARC: [ASID] Refactor the TLB paranoid debug code
  ARC: [ASID] Remove legacy/unused debug code
  ARC: No need to flush the TLB in early boot
  ARC: MMUv4 preps/3 - Abstract out TLB Insert/Delete
  ARC: MMUv4 preps/2 - Reshuffle PTE bits
  ARC: MMUv4 preps/1 - Fold PTE K/U access flags
  ARC: Code cosmetics (Nothing semantical)
  ARC: Entry Handler tweaks: Optimize away redundant IRQ_DISABLE_SAVE
  ARC: Exception Handlers Code consolidation
  ARC: Add some .gitignore entries

1 files changed, 19 insertions, 7 deletions

diff --git a/arch/arc/kernel/unaligned.c b/arch/arc/kernel/unaligned.c
index c0f832f595d3..28d170060747 100644
--- a/arch/arc/kernel/unaligned.c
+++ b/arch/arc/kernel/unaligned.c
@@ -16,6 +16,16 @@
 #include <linux/uaccess.h>
 #include <asm/disasm.h>
 
+#ifdef CONFIG_CPU_BIG_ENDIAN
+#define BE              1
+#define FIRST_BYTE_16   "swap %1, %1\n swape %1, %1\n"
+#define FIRST_BYTE_32   "swape %1, %1\n"
+#else
+#define BE              0
+#define FIRST_BYTE_16
+#define FIRST_BYTE_32
+#endif
+
 #define __get8_unaligned_check(val, addr, err)          \
         __asm__(                                        \
         "1:     ldb.ab  %1, [%2, 1]\n"                  \
@@ -36,9 +46,9 @@
         do {                                            \
                 unsigned int err = 0, v, a = addr;      \
                 __get8_unaligned_check(v, a, err);      \
-                val =  v ;                              \
+                val =  v << ((BE) ? 8 : 0);             \
                 __get8_unaligned_check(v, a, err);      \
-                val |= v << 8;                          \
+                val |= v << ((BE) ? 0 : 8);             \
                 if (err)                                \
                         goto fault;                     \
         } while (0)
@@ -47,13 +57,13 @@
         do {                                            \
                 unsigned int err = 0, v, a = addr;      \
                 __get8_unaligned_check(v, a, err);      \
-                val =  v << 0;                          \
+                val =  v << ((BE) ? 24 : 0);            \
                 __get8_unaligned_check(v, a, err);      \
-                val |= v << 8;                          \
+                val |= v << ((BE) ? 16 : 8);            \
                 __get8_unaligned_check(v, a, err);      \
-                val |= v << 16;                         \
+                val |= v << ((BE) ? 8 : 16);            \
                 __get8_unaligned_check(v, a, err);      \
-                val |= v << 24;                         \
+                val |= v << ((BE) ? 0 : 24);            \
                 if (err)                                \
                         goto fault;                     \
         } while (0)
@@ -63,6 +73,7 @@
                 unsigned int err = 0, v = val, a = addr;\
                                                         \
                 __asm__(                                \
+                FIRST_BYTE_16                           \
                 "1:     stb.ab  %1, [%2, 1]\n"          \
                 "       lsr %1, %1, 8\n"                \
                 "2:     stb     %1, [%2]\n"             \
@@ -87,8 +98,9 @@
 #define put32_unaligned_check(val, addr)                \
         do {                                            \
                 unsigned int err = 0, v = val, a = addr;\
-                __asm__(                                \
                                                         \
+                __asm__(                                \
+                FIRST_BYTE_32                           \
                 "1:     stb.ab  %1, [%2, 1]\n"          \
                 "       lsr %1, %1, 8\n"                \
                 "2:     stb.ab  %1, [%2, 1]\n"          \