Rename task struct in_iowait to sched_in_iowait, since it's only scheduler-specific. Extracted from a patch originally from Peter Zijlstra. Signed-off-by: Mathieu Desnoyers CC: Peter Zijlstra --- include/linux/sched.h | 7 +++---- kernel/sched.c | 8 ++++---- kernel/sched_fair.c | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) Index: linux-2.6-lttng.git/include/linux/sched.h =================================================================== --- linux-2.6-lttng.git.orig/include/linux/sched.h +++ linux-2.6-lttng.git/include/linux/sched.h @@ -1233,11 +1233,10 @@ struct task_struct { unsigned did_exec:1; unsigned in_execve:1; /* Tell the LSMs that the process is doing an * execve */ - unsigned in_iowait:1; - - /* Revert to default priority/policy when forking */ - unsigned sched_reset_on_fork:1; + unsigned sched_in_iowait:1; /* Called io_schedule() */ + unsigned sched_reset_on_fork:1; /* Revert to default + * priority/policy on fork */ pid_t pid; pid_t tgid; Index: linux-2.6-lttng.git/kernel/sched.c =================================================================== --- linux-2.6-lttng.git.orig/kernel/sched.c +++ linux-2.6-lttng.git/kernel/sched.c @@ -4957,9 +4957,9 @@ void __sched io_schedule(void) delayacct_blkio_start(); atomic_inc(&rq->nr_iowait); - current->in_iowait = 1; + current->sched_in_iowait = 1; schedule(); - current->in_iowait = 0; + current->sched_in_iowait = 0; atomic_dec(&rq->nr_iowait); delayacct_blkio_end(); } @@ -4972,9 +4972,9 @@ long __sched io_schedule_timeout(long ti delayacct_blkio_start(); atomic_inc(&rq->nr_iowait); - current->in_iowait = 1; + current->sched_in_iowait = 1; ret = schedule_timeout(timeout); - current->in_iowait = 0; + current->sched_in_iowait = 0; atomic_dec(&rq->nr_iowait); delayacct_blkio_end(); return ret; Index: linux-2.6-lttng.git/kernel/sched_fair.c =================================================================== --- linux-2.6-lttng.git.orig/kernel/sched_fair.c +++ linux-2.6-lttng.git/kernel/sched_fair.c @@ -693,7 +693,7 @@ static void enqueue_sleeper(struct cfs_r se->statistics.sum_sleep_runtime += delta; if (tsk) { - if (tsk->in_iowait) { + if (tsk->sched_in_iowait) { se->statistics.iowait_sum += delta; se->statistics.iowait_count++; trace_sched_stat_iowait(tsk, delta); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/