diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-13 11:35:09 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-13 11:35:09 -0500 |
| commit | bc7ecbcbc2c0ff235382077b55de7896775afc16 (patch) | |
| tree | 9918b2f3fdeebd9c99a308af94d86bc13c80d0c8 /include/linux/kernel_stat.h | |
| parent | c52854018ad123c9ef83867462457b75bb56d452 (diff) | |
| parent | 285eae0a4ba0f467341476fd4c6981e5cdafc6be (diff) | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Diffstat (limited to 'include/linux/kernel_stat.h')
| -rw-r--r-- | include/linux/kernel_stat.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/kernel_stat.h b/include/linux/kernel_stat.h index 348fa8874b52..c059044bc6dc 100644 --- a/include/linux/kernel_stat.h +++ b/include/linux/kernel_stat.h | |||
| @@ -25,6 +25,7 @@ struct cpu_usage_stat { | |||
| 25 | cputime64_t iowait; | 25 | cputime64_t iowait; |
| 26 | cputime64_t steal; | 26 | cputime64_t steal; |
| 27 | cputime64_t guest; | 27 | cputime64_t guest; |
| 28 | cputime64_t guest_nice; | ||
| 28 | }; | 29 | }; |
| 29 | 30 | ||
| 30 | struct kernel_stat { | 31 | struct kernel_stat { |