diff options
| -rw-r--r-- | include/linux/kernel_stat.h | 5 | ||||
| -rw-r--r-- | kernel/sched/core.c | 13 | ||||
| -rw-r--r-- | kernel/time/posix-cpu-timers.c | 2 |
3 files changed, 1 insertions, 19 deletions
diff --git a/include/linux/kernel_stat.h b/include/linux/kernel_stat.h index 8422b4ed6882..b9376cd5a187 100644 --- a/include/linux/kernel_stat.h +++ b/include/linux/kernel_stat.h | |||
| @@ -77,11 +77,6 @@ static inline unsigned int kstat_cpu_irqs_sum(unsigned int cpu) | |||
| 77 | return kstat_cpu(cpu).irqs_sum; | 77 | return kstat_cpu(cpu).irqs_sum; |
| 78 | } | 78 | } |
| 79 | 79 | ||
| 80 | /* | ||
| 81 | * Lock/unlock the current runqueue - to extract task statistics: | ||
| 82 | */ | ||
| 83 | extern unsigned long long task_delta_exec(struct task_struct *); | ||
| 84 | |||
| 85 | extern void account_user_time(struct task_struct *, cputime_t, cputime_t); | 80 | extern void account_user_time(struct task_struct *, cputime_t, cputime_t); |
| 86 | extern void account_system_time(struct task_struct *, int, cputime_t, cputime_t); | 81 | extern void account_system_time(struct task_struct *, int, cputime_t, cputime_t); |
| 87 | extern void account_steal_time(cputime_t); | 82 | extern void account_steal_time(cputime_t); |
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 5f12ca65c9a7..797a6c84c48d 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c | |||
| @@ -2499,19 +2499,6 @@ static u64 do_task_delta_exec(struct task_struct *p, struct rq *rq) | |||
| 2499 | return ns; | 2499 | return ns; |
| 2500 | } | 2500 | } |
| 2501 | 2501 | ||
| 2502 | unsigned long long task_delta_exec(struct task_struct *p) | ||
| 2503 | { | ||
| 2504 | unsigned long flags; | ||
| 2505 | struct rq *rq; | ||
| 2506 | u64 ns = 0; | ||
| 2507 | |||
| 2508 | rq = task_rq_lock(p, &flags); | ||
| 2509 | ns = do_task_delta_exec(p, rq); | ||
| 2510 | task_rq_unlock(rq, p, &flags); | ||
| 2511 | |||
| 2512 | return ns; | ||
| 2513 | } | ||
| 2514 | |||
| 2515 | /* | 2502 | /* |
| 2516 | * Return accounted runtime for the task. | 2503 | * Return accounted runtime for the task. |
| 2517 | * In case the task is currently running, return the runtime plus current's | 2504 | * In case the task is currently running, return the runtime plus current's |
diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c index 492b986195d5..a16b67859e2a 100644 --- a/kernel/time/posix-cpu-timers.c +++ b/kernel/time/posix-cpu-timers.c | |||
| @@ -553,7 +553,7 @@ static int cpu_timer_sample_group(const clockid_t which_clock, | |||
| 553 | *sample = cputime_to_expires(cputime.utime); | 553 | *sample = cputime_to_expires(cputime.utime); |
| 554 | break; | 554 | break; |
| 555 | case CPUCLOCK_SCHED: | 555 | case CPUCLOCK_SCHED: |
| 556 | *sample = cputime.sum_exec_runtime + task_delta_exec(p); | 556 | *sample = cputime.sum_exec_runtime; |
| 557 | break; | 557 | break; |
| 558 | } | 558 | } |
| 559 | return 0; | 559 | return 0; |
