leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds 2019-05-06 15:55:15 -07:00
commit 53f8b081c1
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/x86/entry/entry_32.S
View File

@ -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

3
arch/x86/entry/entry_64.S
View File

@ -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
/* /*