From 97c2811b9e168489e30f2d2f21abe9ff8cf7fb95 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Fri, 20 May 2011 23:14:04 +0200 Subject: [PATCH] --- yaml --- r: 248639 b: refs/heads/master c: 68fa61c026057a39d6ccb850aa8785043afbee02 h: refs/heads/master i: 248637: 6c215e141c2a0d0fa3280695401187a38cdb2414 248635: 95ef838aa4f72f4548e0ec3aa6a4f4c1818aa616 248631: e088062e59abbcdee5a65fa93c6f1e9582087361 248623: 0b9774026752cbfa929e116d2fc35eaf8de373c0 248607: 564e7c12c471a5d10b0768936e97bae6556a8e8c 248575: 691766d7fdbb2c79602aaa54b9fb5f7e7269bdd9 v: v3 --- [refs] | 2 +- trunk/include/linux/hrtimer.h | 2 +- trunk/kernel/hrtimer.c | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index d21ee8b4bd77..546977efc6ea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ab8177bc53e8ae3a3ba6d200ce2c2dae263f7ee5 +refs/heads/master: 68fa61c026057a39d6ccb850aa8785043afbee02 diff --git a/trunk/include/linux/hrtimer.h b/trunk/include/linux/hrtimer.h index 771c95802edc..51932e5acf7c 100644 --- a/trunk/include/linux/hrtimer.h +++ b/trunk/include/linux/hrtimer.h @@ -153,8 +153,8 @@ struct hrtimer_clock_base { }; enum hrtimer_base_type { - HRTIMER_BASE_REALTIME, HRTIMER_BASE_MONOTONIC, + HRTIMER_BASE_REALTIME, HRTIMER_BASE_BOOTTIME, HRTIMER_MAX_CLOCK_BASES, }; diff --git a/trunk/kernel/hrtimer.c b/trunk/kernel/hrtimer.c index 1b08f6d67f12..c541ee527ecb 100644 --- a/trunk/kernel/hrtimer.c +++ b/trunk/kernel/hrtimer.c @@ -63,18 +63,18 @@ DEFINE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases) = .clock_base = { - { - .index = HRTIMER_BASE_REALTIME, - .clockid = CLOCK_REALTIME, - .get_time = &ktime_get_real, - .resolution = KTIME_LOW_RES, - }, { .index = HRTIMER_BASE_MONOTONIC, .clockid = CLOCK_MONOTONIC, .get_time = &ktime_get, .resolution = KTIME_LOW_RES, }, + { + .index = HRTIMER_BASE_REALTIME, + .clockid = CLOCK_REALTIME, + .get_time = &ktime_get_real, + .resolution = KTIME_LOW_RES, + }, { .index = HRTIMER_BASE_BOOTTIME, .clockid = CLOCK_BOOTTIME,