Merge remote-tracking branch 'arc/for-next'

diff --combined arch/arc/kernel/entry.S
index 29b82adbf0b401685b269f81a22d29ffd4fd97a5,b29ffd4e08f348a8c0e2fc7a780c6478272e40d9..83a046a7cd06c964d392380ac88f17fa0759d21a
--- 1/arch/arc/kernel/entry.S
--- 2/arch/arc/kernel/entry.S
+++ b/arch/arc/kernel/entry.S
@@@ -156,7 -156,7 +156,7 @@@ ARCFP_DATA int1_saved_re
  int1_saved_reg:
        .zero 4
  
- /* Each Interrupt level needs it's own scratch */
+ /* Each Interrupt level needs its own scratch */
  #ifdef CONFIG_ARC_COMPACT_IRQ_LEVELS
  
  ARCFP_DATA int2_saved_reg
@@@ -473,7 -473,7 +473,7 @@@ trap_with_param
        lr  r0, [efa]
        mov r1, sp
  
-       ; Now that we have read EFA, its safe to do "fake" rtie
+       ; Now that we have read EFA, it is safe to do "fake" rtie
        ;   and get out of CPU exception mode
        FAKE_RET_FROM_EXCPN r11
  
@@@ -614,13 -614,11 +614,13 @@@ resume_user_mode_begin
  
  resume_kernel_mode:
  
 -#ifdef CONFIG_PREEMPT
 -
 -      ; This is a must for preempt_schedule_irq()
 +      ; Disable Interrupts from this point on
 +      ; CONFIG_PREEMPT: This is a must for preempt_schedule_irq()
 +      ; !CONFIG_PREEMPT: To ensure restore_regs is intr safe
        IRQ_DISABLE     r9
  
 +#ifdef CONFIG_PREEMPT
 +
        ; Can't preempt if preemption disabled
        GET_CURR_THR_INFO_FROM_SP   r10
        ld  r8, [r10, THREAD_INFO_PREEMPT_COUNT]
@@@ -678,9 -676,9 +678,9 @@@ not_exception
        brne r9, event_IRQ2, 149f
  
        ;------------------------------------------------------------------
-       ; if L2 IRQ interrupted a L1 ISR,  we'd disbaled preemption earlier
-       ; so that sched doesnt move to new task, causing L1 to be delayed
-       ; undeterministically. Now that we've achieved that, lets reset
+       ; if L2 IRQ interrupted an L1 ISR,  we'd disabled preemption earlier
+       ; so that sched doesn't move to new task, causing L1 to be delayed
+       ; undeterministically. Now that we've achieved that, let's reset
        ; things to what they were, before returning from L2 context
        ;----------------------------------------------------------------
  
@@@ -736,7 -734,7 +736,7 @@@ ENTRY(ret_from_fork
        ; put last task in scheduler queue
        bl   @schedule_tail
  
-       ; If kernel thread, jump to it's entry-point
+       ; If kernel thread, jump to its entry-point
        ld   r9, [sp, PT_status32]
        brne r9, 0, 1f