diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-14 08:22:37 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-14 08:22:37 -0400 |
| commit | 6967963d6d5cac40a091d075326f0e3ccb95c58a (patch) | |
| tree | a9c29ac6450a7d1dc815f9d97f726ecd59271812 /include/linux/times.h | |
| parent | 9b1a88c7105f593cc61a7acd3c51fcf4bf7b8038 (diff) | |
| parent | 34e51ce60a210094bd66cf0a75dd8512247618ca (diff) | |
Merge branch 'for-2.6.30' into for-2.6.31
Diffstat (limited to 'include/linux/times.h')
| -rw-r--r-- | include/linux/times.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/times.h b/include/linux/times.h index e2d3020742a6..87b62615cedd 100644 --- a/include/linux/times.h +++ b/include/linux/times.h | |||
| @@ -4,10 +4,10 @@ | |||
| 4 | #include <linux/types.h> | 4 | #include <linux/types.h> |
| 5 | 5 | ||
| 6 | struct tms { | 6 | struct tms { |
| 7 | clock_t tms_utime; | 7 | __kernel_clock_t tms_utime; |
| 8 | clock_t tms_stime; | 8 | __kernel_clock_t tms_stime; |
| 9 | clock_t tms_cutime; | 9 | __kernel_clock_t tms_cutime; |
| 10 | clock_t tms_cstime; | 10 | __kernel_clock_t tms_cstime; |
| 11 | }; | 11 | }; |
| 12 | 12 | ||
| 13 | #endif | 13 | #endif |