summaryrefslogtreecommitdiffstats
path: root/kernel/time
diff options
context:
space:
mode:
authorjohn stultz <johnstul@us.ibm.com>2006-06-26 00:25:14 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-26 09:58:21 -0700
commita275254975a29c51929ee175b92ac471ac2a0043 (patch)
tree42ec41bf74c0c601f05ed12ff674539f4bf6f505 /kernel/time
parent5d0cf410e94b1f1ff852c3f210d22cc6c5a27ffa (diff)
downloadkernel-crypto-a275254975a29c51929ee175b92ac471ac2a0043.tar.gz
kernel-crypto-a275254975a29c51929ee175b92ac471ac2a0043.tar.xz
kernel-crypto-a275254975a29c51929ee175b92ac471ac2a0043.zip
[PATCH] time: rename clocksource functions
As suggested by Roman Zippel, change clocksource functions to use clocksource_xyz rather then xyz_clocksource to avoid polluting the namespace. Signed-off-by: John Stultz <johnstul@us.ibm.com> Cc: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/time')
-rw-r--r--kernel/time/clocksource.c16
-rw-r--r--kernel/time/jiffies.c2
2 files changed, 9 insertions, 9 deletions
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c
index a9f387ea83b..74eca5939bd 100644
--- a/kernel/time/clocksource.c
+++ b/kernel/time/clocksource.c
@@ -65,10 +65,10 @@ static int __init clocksource_done_booting(void)
late_initcall(clocksource_done_booting);
/**
- * get_next_clocksource - Returns the selected clocksource
+ * clocksource_get_next - Returns the selected clocksource
*
*/
-struct clocksource *get_next_clocksource(void)
+struct clocksource *clocksource_get_next(void)
{
unsigned long flags;
@@ -142,12 +142,12 @@ static int is_registered_source(struct clocksource *c)
}
/**
- * register_clocksource - Used to install new clocksources
+ * clocksource_register - Used to install new clocksources
* @t: clocksource to be registered
*
* Returns -EBUSY if registration fails, zero otherwise.
*/
-int register_clocksource(struct clocksource *c)
+int clocksource_register(struct clocksource *c)
{
int ret = 0;
unsigned long flags;
@@ -167,17 +167,16 @@ int register_clocksource(struct clocksource *c)
spin_unlock_irqrestore(&clocksource_lock, flags);
return ret;
}
-
-EXPORT_SYMBOL(register_clocksource);
+EXPORT_SYMBOL(clocksource_register);
/**
- * reselect_clocksource - Rescan list for next clocksource
+ * clocksource_reselect - Rescan list for next clocksource
*
* A quick helper function to be used if a clocksource changes its
* rating. Forces the clocksource list to be re-scanned for the best
* clocksource.
*/
-void reselect_clocksource(void)
+void clocksource_reselect(void)
{
unsigned long flags;
@@ -185,6 +184,7 @@ void reselect_clocksource(void)
next_clocksource = select_clocksource();
spin_unlock_irqrestore(&clocksource_lock, flags);
}
+EXPORT_SYMBOL(clocksource_reselect);
/**
* sysfs_show_current_clocksources - sysfs interface for current clocksource
diff --git a/kernel/time/jiffies.c b/kernel/time/jiffies.c
index 1fe8376e717..126bb30c4af 100644
--- a/kernel/time/jiffies.c
+++ b/kernel/time/jiffies.c
@@ -67,7 +67,7 @@ struct clocksource clocksource_jiffies = {
static int __init init_jiffies_clocksource(void)
{
- return register_clocksource(&clocksource_jiffies);
+ return clocksource_register(&clocksource_jiffies);
}
module_init(init_jiffies_clocksource);