diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-10-04 05:08:16 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-10-04 05:09:08 -0400 |
| commit | 22f92bacbeea24b20e447444c28e7cad9f1ac3f8 (patch) | |
| tree | 5c3f2346804a186aa2d954f078fd2f4d44bcc26e /include/linux/sched.h | |
| parent | 557ab425429a5123d37f412ce3e6d6137cb621f8 (diff) | |
| parent | 0f86267b79bc6e357b8606077c7f70239045ea9c (diff) | |
Merge branch 'linus' into sched/core
Merge reason: pick up the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | include/linux/sched.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index bc6f5f2e24fa..9fda2888a6ab 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -1956,7 +1956,6 @@ static inline void disable_sched_clock_irqtime(void) {} | |||
| 1956 | 1956 | ||
| 1957 | extern unsigned long long | 1957 | extern unsigned long long |
| 1958 | task_sched_runtime(struct task_struct *task); | 1958 | task_sched_runtime(struct task_struct *task); |
| 1959 | extern unsigned long long thread_group_sched_runtime(struct task_struct *task); | ||
| 1960 | 1959 | ||
| 1961 | /* sched_exec is called by processes performing an exec */ | 1960 | /* sched_exec is called by processes performing an exec */ |
| 1962 | #ifdef CONFIG_SMP | 1961 | #ifdef CONFIG_SMP |