diff options
Diffstat (limited to 'kernel/time')
-rw-r--r-- | kernel/time/clocksource.c | 16 | ||||
-rw-r--r-- | kernel/time/jiffies.c | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c index a9f387ea83b0..74eca5939bd9 100644 --- a/kernel/time/clocksource.c +++ b/kernel/time/clocksource.c | |||
@@ -65,10 +65,10 @@ static int __init clocksource_done_booting(void) | |||
65 | late_initcall(clocksource_done_booting); | 65 | late_initcall(clocksource_done_booting); |
66 | 66 | ||
67 | /** | 67 | /** |
68 | * get_next_clocksource - Returns the selected clocksource | 68 | * clocksource_get_next - Returns the selected clocksource |
69 | * | 69 | * |
70 | */ | 70 | */ |
71 | struct clocksource *get_next_clocksource(void) | 71 | struct clocksource *clocksource_get_next(void) |
72 | { | 72 | { |
73 | unsigned long flags; | 73 | unsigned long flags; |
74 | 74 | ||
@@ -142,12 +142,12 @@ static int is_registered_source(struct clocksource *c) | |||
142 | } | 142 | } |
143 | 143 | ||
144 | /** | 144 | /** |
145 | * register_clocksource - Used to install new clocksources | 145 | * clocksource_register - Used to install new clocksources |
146 | * @t: clocksource to be registered | 146 | * @t: clocksource to be registered |
147 | * | 147 | * |
148 | * Returns -EBUSY if registration fails, zero otherwise. | 148 | * Returns -EBUSY if registration fails, zero otherwise. |
149 | */ | 149 | */ |
150 | int register_clocksource(struct clocksource *c) | 150 | int clocksource_register(struct clocksource *c) |
151 | { | 151 | { |
152 | int ret = 0; | 152 | int ret = 0; |
153 | unsigned long flags; | 153 | unsigned long flags; |
@@ -167,17 +167,16 @@ int register_clocksource(struct clocksource *c) | |||
167 | spin_unlock_irqrestore(&clocksource_lock, flags); | 167 | spin_unlock_irqrestore(&clocksource_lock, flags); |
168 | return ret; | 168 | return ret; |
169 | } | 169 | } |
170 | 170 | EXPORT_SYMBOL(clocksource_register); | |
171 | EXPORT_SYMBOL(register_clocksource); | ||
172 | 171 | ||
173 | /** | 172 | /** |
174 | * reselect_clocksource - Rescan list for next clocksource | 173 | * clocksource_reselect - Rescan list for next clocksource |
175 | * | 174 | * |
176 | * A quick helper function to be used if a clocksource changes its | 175 | * A quick helper function to be used if a clocksource changes its |
177 | * rating. Forces the clocksource list to be re-scanned for the best | 176 | * rating. Forces the clocksource list to be re-scanned for the best |
178 | * clocksource. | 177 | * clocksource. |
179 | */ | 178 | */ |
180 | void reselect_clocksource(void) | 179 | void clocksource_reselect(void) |
181 | { | 180 | { |
182 | unsigned long flags; | 181 | unsigned long flags; |
183 | 182 | ||
@@ -185,6 +184,7 @@ void reselect_clocksource(void) | |||
185 | next_clocksource = select_clocksource(); | 184 | next_clocksource = select_clocksource(); |
186 | spin_unlock_irqrestore(&clocksource_lock, flags); | 185 | spin_unlock_irqrestore(&clocksource_lock, flags); |
187 | } | 186 | } |
187 | EXPORT_SYMBOL(clocksource_reselect); | ||
188 | 188 | ||
189 | /** | 189 | /** |
190 | * sysfs_show_current_clocksources - sysfs interface for current clocksource | 190 | * sysfs_show_current_clocksources - sysfs interface for current clocksource |
diff --git a/kernel/time/jiffies.c b/kernel/time/jiffies.c index 1fe8376e717b..126bb30c4afe 100644 --- a/kernel/time/jiffies.c +++ b/kernel/time/jiffies.c | |||
@@ -67,7 +67,7 @@ struct clocksource clocksource_jiffies = { | |||
67 | 67 | ||
68 | static int __init init_jiffies_clocksource(void) | 68 | static int __init init_jiffies_clocksource(void) |
69 | { | 69 | { |
70 | return register_clocksource(&clocksource_jiffies); | 70 | return clocksource_register(&clocksource_jiffies); |
71 | } | 71 | } |
72 | 72 | ||
73 | module_init(init_jiffies_clocksource); | 73 | module_init(init_jiffies_clocksource); |