diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ktime.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/ktime.h b/include/linux/ktime.h index 81bb9c7a4eb3..c762954bda14 100644 --- a/include/linux/ktime.h +++ b/include/linux/ktime.h | |||
| @@ -43,7 +43,7 @@ | |||
| 43 | * plain scalar nanosecond based representation can be selected by the | 43 | * plain scalar nanosecond based representation can be selected by the |
| 44 | * config switch CONFIG_KTIME_SCALAR. | 44 | * config switch CONFIG_KTIME_SCALAR. |
| 45 | */ | 45 | */ |
| 46 | typedef union { | 46 | union ktime { |
| 47 | s64 tv64; | 47 | s64 tv64; |
| 48 | #if BITS_PER_LONG != 64 && !defined(CONFIG_KTIME_SCALAR) | 48 | #if BITS_PER_LONG != 64 && !defined(CONFIG_KTIME_SCALAR) |
| 49 | struct { | 49 | struct { |
| @@ -54,7 +54,9 @@ typedef union { | |||
| 54 | # endif | 54 | # endif |
| 55 | } tv; | 55 | } tv; |
| 56 | #endif | 56 | #endif |
| 57 | } ktime_t; | 57 | }; |
| 58 | |||
| 59 | typedef union ktime ktime_t; /* Kill this */ | ||
| 58 | 60 | ||
| 59 | #define KTIME_MAX ((s64)~((u64)1 << 63)) | 61 | #define KTIME_MAX ((s64)~((u64)1 << 63)) |
| 60 | #if (BITS_PER_LONG == 64) | 62 | #if (BITS_PER_LONG == 64) |
