Merge tag 'v3.13' into stable-3.14

Linux 3.13

Conflicts:
	security/selinux/hooks.c

Trivial merge issue in selinux_inet_conn_request() likely due to me
including patches that I sent to the stable folks in my next tree
resulting in the patch hitting twice (I think).  Thankfully it was an
easy fix this time, but regardless, lesson learned, I will not do that
again.

1 files changed, 1 insertions, 7 deletions

diff --git a/arch/m32r/kernel/entry.S b/arch/m32r/kernel/entry.S
index 0c01543f10cd..7c3db9940ce1 100644
--- a/arch/m32r/kernel/entry.S
+++ b/arch/m32r/kernel/entry.S
@@ -182,13 +182,7 @@ need_resched:
         ld      r4, PSW(sp)             ; interrupts off (exception path) ?
         and3    r4, r4, #0x4000
         beqz    r4, restore_all
-        LDIMM   (r4, PREEMPT_ACTIVE)
-        st      r4, @(TI_PRE_COUNT, r8)
-        ENABLE_INTERRUPTS(r4)
-        bl      schedule
-        ldi     r4, #0
-        st      r4, @(TI_PRE_COUNT, r8)
-        DISABLE_INTERRUPTS(r4)
+        bl      preempt_schedule_irq
         bra     need_resched
 #endif