summaryrefslogtreecommitdiffstats
path: root/kernel/sched/idle_task.c
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2014-12-09 11:12:26 -0500
committerJ. Bruce Fields <bfields@redhat.com>2014-12-09 11:12:26 -0500
commit2941b0e91ba68b1f77140e556307e00616a5bb46 (patch)
tree01950b6ed12d06ebe4c39d1a2122050a9a570e93 /kernel/sched/idle_task.c
parent818f2f57f20d0e9a9294180f304f34cd4e8f6066 (diff)
parent388f0c776781fe64ce951701bfe712b2182a31f2 (diff)
downloadlinux-2941b0e91ba68b1f77140e556307e00616a5bb46.tar.gz
linux-2941b0e91ba68b1f77140e556307e00616a5bb46.tar.bz2
linux-2941b0e91ba68b1f77140e556307e00616a5bb46.zip
Merge tag 'nfs-for-3.19-1' into nfsd for-3.19 branch
Mainly what I need is 860a0d9e511f "sunrpc: add some tracepoints in svc_rqst handling functions", which subsequent server rpc patches from jlayton depend on. I'm merging this later tag on the assumption that's more likely to be a tested and stable point.
Diffstat (limited to 'kernel/sched/idle_task.c')
-rw-r--r--kernel/sched/idle_task.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/sched/idle_task.c b/kernel/sched/idle_task.c
index 67ad4e7f506a..c65dac8c97cd 100644
--- a/kernel/sched/idle_task.c
+++ b/kernel/sched/idle_task.c
@@ -75,6 +75,10 @@ static unsigned int get_rr_interval_idle(struct rq *rq, struct task_struct *task
return 0;
}
+static void update_curr_idle(struct rq *rq)
+{
+}
+
/*
* Simple, special scheduling class for the per-CPU idle tasks:
*/
@@ -101,4 +105,5 @@ const struct sched_class idle_sched_class = {
.prio_changed = prio_changed_idle,
.switched_to = switched_to_idle,
+ .update_curr = update_curr_idle,
};