diff options
| author | john stultz <johnstul@us.ibm.com> | 2006-06-26 00:25:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 09:58:21 -0700 |
| commit | a275254975a29c51929ee175b92ac471ac2a0043 (patch) | |
| tree | 42ec41bf74c0c601f05ed12ff674539f4bf6f505 /arch/i386/kernel | |
| parent | 5d0cf410e94b1f1ff852c3f210d22cc6c5a27ffa (diff) | |
[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 'arch/i386/kernel')
| -rw-r--r-- | arch/i386/kernel/hpet.c | 2 | ||||
| -rw-r--r-- | arch/i386/kernel/i8253.c | 2 | ||||
| -rw-r--r-- | arch/i386/kernel/tsc.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/i386/kernel/hpet.c b/arch/i386/kernel/hpet.c index 91a5bdd9f60..23e7d2c5d25 100644 --- a/arch/i386/kernel/hpet.c +++ b/arch/i386/kernel/hpet.c @@ -61,7 +61,7 @@ static int __init init_hpet_clocksource(void) do_div(tmp, FSEC_PER_NSEC); clocksource_hpet.mult = (u32)tmp; - return register_clocksource(&clocksource_hpet); + return clocksource_register(&clocksource_hpet); } module_init(init_hpet_clocksource); diff --git a/arch/i386/kernel/i8253.c b/arch/i386/kernel/i8253.c index a276bceade6..5b13739a7ff 100644 --- a/arch/i386/kernel/i8253.c +++ b/arch/i386/kernel/i8253.c @@ -80,6 +80,6 @@ static int __init init_pit_clocksource(void) return 0; clocksource_pit.mult = clocksource_hz2mult(CLOCK_TICK_RATE, 20); - return register_clocksource(&clocksource_pit); + return clocksource_register(&clocksource_pit); } module_init(init_pit_clocksource); diff --git a/arch/i386/kernel/tsc.c b/arch/i386/kernel/tsc.c index 7713f86389a..1c3c927755d 100644 --- a/arch/i386/kernel/tsc.c +++ b/arch/i386/kernel/tsc.c @@ -351,7 +351,7 @@ static int tsc_update_callback(void) /* check to see if we should switch to the safe clocksource: */ if (clocksource_tsc.rating != 50 && check_tsc_unstable()) { clocksource_tsc.rating = 50; - reselect_clocksource(); + clocksource_reselect(); change = 1; } @@ -469,7 +469,7 @@ static int __init init_tsc_clocksource(void) jiffies + msecs_to_jiffies(TSC_FREQ_CHECK_INTERVAL); add_timer(&verify_tsc_freq_timer); - return register_clocksource(&clocksource_tsc); + return clocksource_register(&clocksource_tsc); } return 0; |