diff options
Diffstat (limited to 'arch/um')
-rw-r--r-- | arch/um/Kconfig.common | 4 | ||||
-rw-r--r-- | arch/um/kernel/time.c | 16 |
2 files changed, 8 insertions, 12 deletions
diff --git a/arch/um/Kconfig.common b/arch/um/Kconfig.common index 0d207e73a758..7c8e277f6d34 100644 --- a/arch/um/Kconfig.common +++ b/arch/um/Kconfig.common | |||
@@ -55,10 +55,6 @@ config GENERIC_BUG | |||
55 | default y | 55 | default y |
56 | depends on BUG | 56 | depends on BUG |
57 | 57 | ||
58 | config GENERIC_TIME | ||
59 | bool | ||
60 | default y | ||
61 | |||
62 | config GENERIC_CLOCKEVENTS | 58 | config GENERIC_CLOCKEVENTS |
63 | bool | 59 | bool |
64 | default y | 60 | default y |
diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c index c8b9c469fcd7..a08d9fab81f2 100644 --- a/arch/um/kernel/time.c +++ b/arch/um/kernel/time.c | |||
@@ -102,16 +102,16 @@ static void __init setup_itimer(void) | |||
102 | clockevents_register_device(&itimer_clockevent); | 102 | clockevents_register_device(&itimer_clockevent); |
103 | } | 103 | } |
104 | 104 | ||
105 | void __init time_init(void) | 105 | void read_persistent_clock(struct timespec *ts) |
106 | { | 106 | { |
107 | long long nsecs; | 107 | long long nsecs = os_nsecs(); |
108 | |||
109 | timer_init(); | ||
110 | 108 | ||
111 | nsecs = os_nsecs(); | 109 | set_normalized_timespec(ts, nsecs / NSEC_PER_SEC, |
112 | set_normalized_timespec(&wall_to_monotonic, -nsecs / NSEC_PER_SEC, | ||
113 | -nsecs % NSEC_PER_SEC); | ||
114 | set_normalized_timespec(&xtime, nsecs / NSEC_PER_SEC, | ||
115 | nsecs % NSEC_PER_SEC); | 110 | nsecs % NSEC_PER_SEC); |
111 | } | ||
112 | |||
113 | void __init time_init(void) | ||
114 | { | ||
115 | timer_init(); | ||
116 | late_time_init = setup_itimer; | 116 | late_time_init = setup_itimer; |
117 | } | 117 | } |