--- kernel/posix-cpu-timers.c

+++ kernel/posix-cpu-timers.c

@@ -250,7 +250,7 @@ void thread_group_cputime(struct task_st

do {

times->utime = cputime_add(times->utime, t->utime);

times->stime = cputime_add(times->stime, t->stime);

- times->sum_exec_runtime += task_sched_runtime(t);

+ times->sum_exec_runtime += tsk_seruntime(t);

} while_each_thread(tsk, t);

out:

rcu_read_unlock();

@@ -512,7 +512,7 @@ static void cleanup_timers(struct list_h

void posix_cpu_timers_exit(struct task_struct *tsk)

{

cleanup_timers(tsk->cpu_timers,

- tsk->utime, tsk->stime, tsk->se.sum_exec_runtime);

+ tsk->utime, tsk->stime, tsk_seruntime(tsk));

}

void posix_cpu_timers_exit_group(struct task_struct *tsk)

@@ -522,7 +522,7 @@ void posix_cpu_timers_exit_group(struct

cleanup_timers(tsk->signal->cpu_timers,

cputime_add(tsk->utime, sig->utime),

cputime_add(tsk->stime, sig->stime),

- tsk->se.sum_exec_runtime + sig->sum_sched_runtime);

+ tsk_seruntime(tsk) + sig->sum_sched_runtime);

}

static void clear_dead_task(struct k_itimer *timer, union cpu_time_count now)

@@ -953,7 +953,7 @@ static void check_thread_timers(struct t

struct cpu_timer_list *t = list_first_entry(timers,

struct cpu_timer_list,

entry);

- if (!--maxfire || tsk->se.sum_exec_runtime < t->expires.sched) {

+ if (!--maxfire || tsk_seruntime(tsk) < t->expires.sched) {

tsk->cputime_expires.sched_exp = t->expires.sched;

break;

}

@@ -970,7 +970,7 @@ static void check_thread_timers(struct t

ACCESS_ONCE(sig->rlim[RLIMIT_RTTIME].rlim_max);

if (hard != RLIM_INFINITY &&

- tsk->rt.timeout > DIV_ROUND_UP(hard, USEC_PER_SEC/HZ)) {

+ tsk_rttimeout(tsk) > DIV_ROUND_UP(hard, USEC_PER_SEC/HZ)) {

/*

* At the hard limit, we just die.

* No need to calculate anything else now.

@@ -978,7 +978,7 @@ static void check_thread_timers(struct t

__group_send_sig_info(SIGKILL, SEND_SIG_PRIV, tsk);

return;

}

- if (tsk->rt.timeout > DIV_ROUND_UP(soft, USEC_PER_SEC/HZ)) {

+ if (tsk_rttimeout(tsk) > DIV_ROUND_UP(soft, USEC_PER_SEC/HZ)) {

/*

* At the soft limit, send a SIGXCPU every second.

*/

@@ -1280,7 +1280,7 @@ static inline int fastpath_timer_check(s

struct task_cputime task_sample = {

.utime = tsk->utime,

.stime = tsk->stime,

- .sum_exec_runtime = tsk->se.sum_exec_runtime

+ .sum_exec_runtime = tsk_seruntime(tsk)

};

if (task_cputime_expired(&task_sample, &tsk->cputime_expires))