Merge branch 'devel-stable' into for-next

Conflicts:
	arch/arm/Makefile
	arch/arm/include/asm/glue-proc.h

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Makefile
index de4e1cb2f14f50106941d1c080d4f24341672382,3380c4f517579ebd4da5a3d5fb5ed7fc30e55fb6..d6608b10e062ff1ecec31af29cade73376f523f9
--- 1/arch/arm/Makefile
--- 2/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -59,8 -59,9 +59,9 @@@ comma = 
  # Note that GCC does not numerically define an architecture version
  # macro, but instead defines a whole series of macros which makes
  # testing for a specific architecture or later rather impossible.
 -arch-$(CONFIG_CPU_32v7M)      :=-D__LINUX_ARM_ARCH__=7 -march=armv7-m -Wa,-march=armv7-m
 -arch-$(CONFIG_CPU_32v7)               :=-D__LINUX_ARM_ARCH__=7 $(call cc-option,-march=armv7-a,-march=armv5t -Wa$(comma)-march=armv7-a)
 -arch-$(CONFIG_CPU_32v6)               :=-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6,-march=armv5t -Wa$(comma)-march=armv6)
++arch-$(CONFIG_CPU_32v7M)      =-D__LINUX_ARM_ARCH__=7 -march=armv7-m -Wa,-march=armv7-m
 +arch-$(CONFIG_CPU_32v7)               =-D__LINUX_ARM_ARCH__=7 $(call cc-option,-march=armv7-a,-march=armv5t -Wa$(comma)-march=armv7-a)
 +arch-$(CONFIG_CPU_32v6)               =-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6,-march=armv5t -Wa$(comma)-march=armv6)
  # Only override the compiler option if ARMv6. The ARMv6K extensions are
  # always available in ARMv7
  ifeq ($(CONFIG_CPU_32v6),y)

diff --cc arch/arm/include/asm/cputype.h
Simple merge

diff --cc arch/arm/include/asm/glue-proc.h
index 8017e94acc5e0883082212e9714e68cebf40f52b,f2f39bcf7945a29de90f59d6afdd79e67bd06f43..74a8b84f3cb1d1d35f9de0461483968cc93132bc
--- 1/arch/arm/include/asm/glue-proc.h
--- 2/arch/arm/include/asm/glue-proc.h
+++ b/arch/arm/include/asm/glue-proc.h
@@@ -230,15 -230,15 +230,24 @@@
  # endif
  #endif
  
+ #ifdef CONFIG_CPU_V7M
+ # ifdef CPU_NAME
+ #  undef  MULTI_CPU
+ #  define MULTI_CPU
+ # else
+ #  define CPU_NAME cpu_v7m
+ # endif
+ #endif
+ 
 +#ifdef CONFIG_CPU_PJ4B
 +# ifdef CPU_NAME
 +#  undef  MULTI_CPU
 +#  define MULTI_CPU
 +# else
 +#  define CPU_NAME cpu_pj4b
 +# endif
 +#endif
 +
  #ifndef MULTI_CPU
  #define cpu_proc_init                 __glue(CPU_NAME,_proc_init)
  #define cpu_proc_fin                  __glue(CPU_NAME,_proc_fin)

diff --cc arch/arm/include/asm/smp_plat.h
Simple merge

diff --cc arch/arm/include/asm/tlb.h
Simple merge

diff --cc arch/arm/kernel/entry-common.S
index 4bc816a74a2ee9e9e478165846f4b79680bb395c,85a72b0809ca11c445352c4f49b54a5b0638ba48..94104bf69719f896e51836ca8a048077086fbb0a
--- 1/arch/arm/kernel/entry-common.S
--- 2/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@@ -360,18 -363,9 +363,19 @@@ ENTRY(vector_swi
        str     lr, [sp, #S_PC]                 @ Save calling PC
        str     r8, [sp, #S_PSR]                @ Save CPSR
        str     r0, [sp, #S_OLD_R0]             @ Save OLD_R0
+ #endif
        zero_fp
  
 +#ifdef CONFIG_ALIGNMENT_TRAP
 +      ldr     ip, __cr_alignment
 +      ldr     ip, [ip]
 +      mcr     p15, 0, ip, c1, c0              @ update control register
 +#endif
 +
 +      enable_irq
 +      ct_user_exit
 +      get_thread_info tsk
 +
        /*
         * Get the system call number.
         */

diff --cc arch/arm/kernel/setup.c
index 0cde326f55420868dbe6f460f3ead9ca1440b903,9048513cbe0d564c91467a0525efbf87c07344a6..9b653278c9e8932c354e31383cb995ebf594789e
--- 1/arch/arm/kernel/setup.c
--- 2/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@@ -442,9 -460,10 +460,10 @@@ void notrace cpu_init(void
              "I" (offsetof(struct stack, und[0])),
              PLC (PSR_F_BIT | PSR_I_BIT | SVC_MODE)
            : "r14");
+ #endif
  }
  
 -int __cpu_logical_map[NR_CPUS];
 +u32 __cpu_logical_map[NR_CPUS] = { [0 ... NR_CPUS-1] = MPIDR_INVALID };
  
  void __init smp_setup_processor_id(void)
  {

diff --cc arch/arm/kernel/smp.c
Simple merge

diff --cc arch/arm/kernel/traps.c
Simple merge

diff --cc arch/arm/mach-exynos/Kconfig
Simple merge

diff --cc arch/arm/mm/context.c
Simple merge

diff --cc arch/arm/mm/dma-mapping.c
Simple merge

diff --cc arch/arm/mm/flush.c
Simple merge

diff --cc arch/arm/mm/mmu.c
Simple merge

diff --cc arch/arm/mm/nommu.c
Simple merge

diff --cc arch/arm/mm/proc-v7.S
index e35fec34453ea13d57e2f1902a07bc99e21ba731,f85ae8cad17f459c7525c9f7c0053add0b68b7a8..7ef3ad05df398656d2f63302139288154fa1abfd
--- 1/arch/arm/mm/proc-v7.S
--- 2/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@@ -433,15 -412,23 +438,25 @@@ __v7_ca9mp_proc_info
        /*
         * Marvell PJ4B processor.
         */
 +#ifdef CONFIG_CPU_PJ4B
        .type   __v7_pj4b_proc_info, #object
  __v7_pj4b_proc_info:
 -      .long   0x562f5840
 -      .long   0xfffffff0
 -      __v7_proc __v7_pj4b_setup
 +      .long   0x560f5800
 +      .long   0xff0fff00
 +      __v7_proc __v7_pj4b_setup, proc_fns = pj4b_processor_functions
        .size   __v7_pj4b_proc_info, . - __v7_pj4b_proc_info
 +#endif
  
+       /*
+        * ARM Ltd. Cortex R7 processor.
+        */
+       .type   __v7_cr7mp_proc_info, #object
+ __v7_cr7mp_proc_info:
+       .long   0x410fc170
+       .long   0xff0ffff0
+       __v7_proc __v7_cr7mp_setup
+       .size   __v7_cr7mp_proc_info, . - __v7_cr7mp_proc_info
+ 
        /*
         * ARM Ltd. Cortex A7 processor.
         */