diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-31 14:05:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-31 14:05:35 -0700 |
| commit | f5fa363026c3508735c6ab2f1029110d2c4966a2 (patch) | |
| tree | 3fb2d1be0c1a6f49dc70a9aff2dd6e9a6710570b /arch | |
| parent | 5656b408ff2696551c0f572689edcad3113e3a32 (diff) | |
| parent | f3a7e1a9c464a32ee186ab91388313c82e7ce018 (diff) | |
| download | linux-f5fa363026c3508735c6ab2f1029110d2c4966a2.tar.gz linux-f5fa363026c3508735c6ab2f1029110d2c4966a2.tar.bz2 linux-f5fa363026c3508735c6ab2f1029110d2c4966a2.zip | |
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fixes from Ingo Molnar:
"Various scheduler fixes all over the place: three SCHED_DL fixes,
three sched/numa fixes, two generic race fixes and a comment fix"
* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
sched/dl: Fix preemption checks
sched: Update comments for CLONE_NEWNS
sched: stop the unbound recursion in preempt_schedule_context()
sched/fair: Fix division by zero sysctl_numa_balancing_scan_size
sched/fair: Care divide error in update_task_scan_period()
sched/numa: Fix unsafe get_task_struct() in task_numa_assign()
sched/deadline: Fix races between rt_mutex_setprio() and dl_task_timer()
sched/deadline: Don't replenish from a !SCHED_DEADLINE entity
sched: Fix race between task_group and sched_task_group
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/include/asm/preempt.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/preempt.h b/arch/x86/include/asm/preempt.h index 7024c12f7bfe..400873450e33 100644 --- a/arch/x86/include/asm/preempt.h +++ b/arch/x86/include/asm/preempt.h @@ -105,6 +105,7 @@ static __always_inline bool should_resched(void) # ifdef CONFIG_CONTEXT_TRACKING extern asmlinkage void ___preempt_schedule_context(void); # define __preempt_schedule_context() asm ("call ___preempt_schedule_context") + extern asmlinkage void preempt_schedule_context(void); # endif #endif |