diff options
| author |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-29 14:06:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-29 14:06:19 -0700 |
| commit | db8185360d91c01f6e482db5ee402c0ad90dec52 (patch) | |
| tree | 5195407be8483cd9ae206a7877d60ebb886112bd /include | |
| parent | Revert "x86_64: allocate sparsemem memmap above 4G" (diff) | |
| parent | sched: fix style in kernel/sched.c (diff) | |
| download | linux-dev-db8185360d91c01f6e482db5ee402c0ad90dec52.tar.xz linux-dev-db8185360d91c01f6e482db5ee402c0ad90dec52.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched:
sched: fix style in kernel/sched.c
sched: fix style of swap() macro in kernel/sched_fair.c
sched: report CPU usage in CFS cgroup directories
sched: move rcu_head to task_group struct
sched: fix incorrect assumption that cpu 0 exists
sched: keep utime/stime monotonic
sched: make kernel/sched.c:account_guest_time() static
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/sched.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 3c07d595979f..b0b1fe6e0b17 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1009,6 +1009,7 @@ struct task_struct { unsigned int rt_priority; cputime_t utime, stime, utimescaled, stimescaled; cputime_t gtime; + cputime_t prev_utime; unsigned long nvcsw, nivcsw; /* context switch counts */ struct timespec start_time; /* monotonic time */ struct timespec real_start_time; /* boot based time */ |