Commit 53f8b081 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'x86-entry-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 entry cleanup from Ingo Molnar:
 "A single commit that removes a redundant complication from
  preempt-schedule handling in the x86 entry code"

* 'x86-entry-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/entry: Remove unneeded need_resched() loop
parents 31a4319b b5b447b6
...@@ -768,13 +768,12 @@ END(ret_from_exception) ...@@ -768,13 +768,12 @@ END(ret_from_exception)
#ifdef CONFIG_PREEMPT #ifdef CONFIG_PREEMPT
ENTRY(resume_kernel) ENTRY(resume_kernel)
DISABLE_INTERRUPTS(CLBR_ANY) DISABLE_INTERRUPTS(CLBR_ANY)
.Lneed_resched:
cmpl $0, PER_CPU_VAR(__preempt_count) cmpl $0, PER_CPU_VAR(__preempt_count)
jnz restore_all_kernel jnz restore_all_kernel
testl $X86_EFLAGS_IF, PT_EFLAGS(%esp) # interrupts off (exception path) ? testl $X86_EFLAGS_IF, PT_EFLAGS(%esp) # interrupts off (exception path) ?
jz restore_all_kernel jz restore_all_kernel
call preempt_schedule_irq call preempt_schedule_irq
jmp .Lneed_resched jmp restore_all_kernel
END(resume_kernel) END(resume_kernel)
#endif #endif
......
...@@ -645,10 +645,9 @@ retint_kernel: ...@@ -645,10 +645,9 @@ retint_kernel:
/* Check if we need preemption */ /* Check if we need preemption */
btl $9, EFLAGS(%rsp) /* were interrupts off? */ btl $9, EFLAGS(%rsp) /* were interrupts off? */
jnc 1f jnc 1f
0: cmpl $0, PER_CPU_VAR(__preempt_count) cmpl $0, PER_CPU_VAR(__preempt_count)
jnz 1f jnz 1f
call preempt_schedule_irq call preempt_schedule_irq
jmp 0b
1: 1:
#endif #endif
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment