diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-24 09:42:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-24 09:42:50 -0700 |
| commit | be53f58fa0fcd97c62a84f2eb98cff528f8b2443 (patch) | |
| tree | 8026c54554a32777130f535a0b1685cb5078210d /kernel/sched/cpuacct.h | |
| parent | 19d6f04cd374b886b98d7b070ebf287c93bff7ac (diff) | |
| parent | 73e6aafd9ea81498d31361f01db84a0118da2d1c (diff) | |
| download | blackbird-op-linux-be53f58fa0fcd97c62a84f2eb98cff528f8b2443.tar.gz blackbird-op-linux-be53f58fa0fcd97c62a84f2eb98cff528f8b2443.zip | |
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fixes from Ingo Molnar:
"Misc fixes: a cgroup fix, a fair-scheduler migration accounting fix, a
cputime fix and two cpuacct cleanups"
* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
sched/cpuacct: Simplify the cpuacct code
sched/cpuacct: Rename parameter in cpuusage_write() for readability
sched/fair: Add comments to explain select_idle_sibling()
sched/fair: Fix fairness issue on migration
sched/cgroup: Fix/cleanup cgroup teardown/init
sched/cputime: Fix steal time accounting vs. CPU hotplug
Diffstat (limited to 'kernel/sched/cpuacct.h')
| -rw-r--r-- | kernel/sched/cpuacct.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sched/cpuacct.h b/kernel/sched/cpuacct.h index ed605624a5e7..ba72807c73d4 100644 --- a/kernel/sched/cpuacct.h +++ b/kernel/sched/cpuacct.h @@ -1,7 +1,7 @@ #ifdef CONFIG_CGROUP_CPUACCT extern void cpuacct_charge(struct task_struct *tsk, u64 cputime); -extern void cpuacct_account_field(struct task_struct *p, int index, u64 val); +extern void cpuacct_account_field(struct task_struct *tsk, int index, u64 val); #else @@ -10,7 +10,7 @@ static inline void cpuacct_charge(struct task_struct *tsk, u64 cputime) } static inline void -cpuacct_account_field(struct task_struct *p, int index, u64 val) +cpuacct_account_field(struct task_struct *tsk, int index, u64 val) { } |
