diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-18 23:58:24 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-18 23:58:24 +0200 |
commit | 823d93640927d739f7c918b73fe5ec494fb27e17 (patch) | |
tree | dea028ddd214541b76c1c26f5f21ddc46157e67e /kernel/sched/sched.h | |
parent | 7664e969359917ba3212c5d6efdec494eaf8586e (diff) | |
parent | d9914cf66181b8aa0929775f5c6f675c6ebc3eb5 (diff) | |
download | op-kernel-dev-823d93640927d739f7c918b73fe5ec494fb27e17.zip op-kernel-dev-823d93640927d739f7c918b73fe5ec494fb27e17.tar.gz |
Merge branch 'fixes' into pm-sleep
The 'fixes' branch contains material the next commit depends on.
Diffstat (limited to 'kernel/sched/sched.h')
-rw-r--r-- | kernel/sched/sched.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 6d52cea..55844f2 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -942,8 +942,6 @@ static inline u64 sched_avg_period(void) return (u64)sysctl_sched_time_avg * NSEC_PER_MSEC / 2; } -void calc_load_account_idle(struct rq *this_rq); - #ifdef CONFIG_SCHED_HRTICK /* |