diff options
| -rw-r--r-- | include/linux/hrtimer.h | 2 | ||||
| -rw-r--r-- | kernel/hrtimer.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h index 771c95802edc..51932e5acf7c 100644 --- a/include/linux/hrtimer.h +++ b/include/linux/hrtimer.h | |||
| @@ -153,8 +153,8 @@ struct hrtimer_clock_base { | |||
| 153 | }; | 153 | }; |
| 154 | 154 | ||
| 155 | enum hrtimer_base_type { | 155 | enum hrtimer_base_type { |
| 156 | HRTIMER_BASE_REALTIME, | ||
| 157 | HRTIMER_BASE_MONOTONIC, | 156 | HRTIMER_BASE_MONOTONIC, |
| 157 | HRTIMER_BASE_REALTIME, | ||
| 158 | HRTIMER_BASE_BOOTTIME, | 158 | HRTIMER_BASE_BOOTTIME, |
| 159 | HRTIMER_MAX_CLOCK_BASES, | 159 | HRTIMER_MAX_CLOCK_BASES, |
| 160 | }; | 160 | }; |
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index 1b08f6d67f12..c541ee527ecb 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c | |||
| @@ -64,18 +64,18 @@ DEFINE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases) = | |||
| 64 | .clock_base = | 64 | .clock_base = |
| 65 | { | 65 | { |
| 66 | { | 66 | { |
| 67 | .index = HRTIMER_BASE_REALTIME, | ||
| 68 | .clockid = CLOCK_REALTIME, | ||
| 69 | .get_time = &ktime_get_real, | ||
| 70 | .resolution = KTIME_LOW_RES, | ||
| 71 | }, | ||
| 72 | { | ||
| 73 | .index = HRTIMER_BASE_MONOTONIC, | 67 | .index = HRTIMER_BASE_MONOTONIC, |
| 74 | .clockid = CLOCK_MONOTONIC, | 68 | .clockid = CLOCK_MONOTONIC, |
| 75 | .get_time = &ktime_get, | 69 | .get_time = &ktime_get, |
| 76 | .resolution = KTIME_LOW_RES, | 70 | .resolution = KTIME_LOW_RES, |
| 77 | }, | 71 | }, |
| 78 | { | 72 | { |
| 73 | .index = HRTIMER_BASE_REALTIME, | ||
| 74 | .clockid = CLOCK_REALTIME, | ||
| 75 | .get_time = &ktime_get_real, | ||
| 76 | .resolution = KTIME_LOW_RES, | ||
| 77 | }, | ||
| 78 | { | ||
| 79 | .index = HRTIMER_BASE_BOOTTIME, | 79 | .index = HRTIMER_BASE_BOOTTIME, |
| 80 | .clockid = CLOCK_BOOTTIME, | 80 | .clockid = CLOCK_BOOTTIME, |
| 81 | .get_time = &ktime_get_boottime, | 81 | .get_time = &ktime_get_boottime, |
