diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2012-03-21 21:42:14 +0100 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2012-03-26 17:48:54 +0200 |
| commit | 1df00640c9111c881633d9b219f18e66c52599ec (patch) | |
| tree | e36d3924d84f47ec93f6650ff1fd5b8ea7d10d24 /kernel/sched/rt.c | |
| parent | NFSD: Fix nfs4_verifier memory alignment (diff) | |
| parent | NFS: fix sb->s_id in nfs debug prints (diff) | |
| download | linux-1df00640c9111c881633d9b219f18e66c52599ec.tar.xz linux-1df00640c9111c881633d9b219f18e66c52599ec.zip | |
Merge nfs containerization work from Trond's tree
The nfs containerization work is a prerequisite for Jeff Layton's reboot
recovery rework.
Diffstat (limited to 'kernel/sched/rt.c')
| -rw-r--r-- | kernel/sched/rt.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c index 3640ebbb466b..f42ae7fb5ec5 100644 --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c @@ -1587,6 +1587,11 @@ static int push_rt_task(struct rq *rq) if (!next_task) return 0; +#ifdef __ARCH_WANT_INTERRUPTS_ON_CTXSW + if (unlikely(task_running(rq, next_task))) + return 0; +#endif + retry: if (unlikely(next_task == rq->curr)) { WARN_ON(1); |