Merge branch 'spectre' of git://git.armlinux.org.uk/~rmk/linux-arm

Pull ARM fix from Russell King:
 "Ard spotted a typo in one of the assembly files which leads to a
  kernel oops when that code path is executed. Fix this"

* 'spectre' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 8809/1: proc-v7: fix Thumb annotation of cpu_v7_hvc_switch_mm

diff --combined arch/arm/mm/proc-v7.S
index 6fe5281,fccd4d9..339eb17
--- 1/arch/arm/mm/proc-v7.S
--- 2/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@@ -112,7 -112,7 +112,7 @@@ ENTRY(cpu_v7_hvc_switch_mm
        hvc     #0
        ldmfd   sp!, {r0 - r3}
        b       cpu_v7_switch_mm
- ENDPROC(cpu_v7_smc_switch_mm)
+ ENDPROC(cpu_v7_hvc_switch_mm)
  #endif
  ENTRY(cpu_v7_iciallu_switch_mm)
        mov     r3, #0
@@@ -279,7 -279,6 +279,7 @@@ ENDPROC(cpu_pj4b_do_resume
  __v7_ca5mp_setup:
  __v7_ca9mp_setup:
  __v7_cr7mp_setup:
 +__v7_cr8mp_setup:
        mov     r10, #(1 << 0)                  @ Cache/TLB ops broadcasting
        b       1f
  __v7_ca7mp_setup:
@@@ -717,16 -716,6 +717,16 @@@ __v7_cr7mp_proc_info
        .size   __v7_cr7mp_proc_info, . - __v7_cr7mp_proc_info
  
        /*
 +       * ARM Ltd. Cortex R8 processor.
 +       */
 +      .type   __v7_cr8mp_proc_info, #object
 +__v7_cr8mp_proc_info:
 +      .long   0x410fc180
 +      .long   0xff0ffff0
 +      __v7_proc __v7_cr8mp_proc_info, __v7_cr8mp_setup
 +      .size   __v7_cr8mp_proc_info, . - __v7_cr8mp_proc_info
 +
 +      /*
         * ARM Ltd. Cortex A7 processor.
         */
        .type   __v7_ca7mp_proc_info, #object