diff --git a/[refs] b/[refs] index a5635af79f3a..c89756376a2f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 01dd2fbf0da4019c380b6ca22a074538fb31db5a +refs/heads/master: 6888c1ecd63a3e5e206048602b3f59b58f4ffd8f diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index a54bd9dfbedb..7581e331b139 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -3310,7 +3310,6 @@ unsigned long long task_sched_runtime(struct task_struct *p) /* * Account user cpu time to a process. * @p: the process that the cpu time gets accounted to - * @hardirq_offset: the offset to subtract from hardirq_count() * @cputime: the cpu time spent in user space since the last update */ void account_user_time(struct task_struct *p, cputime_t cputime)