From 67fbc53420040fa77de4190c14e37863f307f6c8 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Mon, 29 Dec 2003 05:44:41 -0800 Subject: [PATCH] [PATCH] Be verbose about the ia32 time source From: john stultz The patch arranges for each timesource type to have a name, and uses that to tell the user which timesource is in use at bootup time. --- arch/i386/kernel/time.c | 4 ++++ arch/i386/kernel/timers/timer_cyclone.c | 1 + arch/i386/kernel/timers/timer_hpet.c | 1 + arch/i386/kernel/timers/timer_none.c | 1 + arch/i386/kernel/timers/timer_pit.c | 1 + arch/i386/kernel/timers/timer_tsc.c | 1 + include/asm-i386/timer.h | 1 + 7 files changed, 10 insertions(+) diff --git a/arch/i386/kernel/time.c b/arch/i386/kernel/time.c index 3ab55d36acde4..1351b4c431d60 100644 --- a/arch/i386/kernel/time.c +++ b/arch/i386/kernel/time.c @@ -342,6 +342,8 @@ void __init hpet_time_init(void) } cur_timer = select_timer(); + printk(KERN_INFO "Using %s for high-res timesource\n",cur_timer->name); + time_init_hook(); } #endif @@ -364,5 +366,7 @@ void __init time_init(void) wall_to_monotonic.tv_nsec = -xtime.tv_nsec; cur_timer = select_timer(); + printk(KERN_INFO "Using %s for high-res timesource\n",cur_timer->name); + time_init_hook(); } diff --git a/arch/i386/kernel/timers/timer_cyclone.c b/arch/i386/kernel/timers/timer_cyclone.c index 2dd4398ec037f..d081539d5693f 100644 --- a/arch/i386/kernel/timers/timer_cyclone.c +++ b/arch/i386/kernel/timers/timer_cyclone.c @@ -253,6 +253,7 @@ static void delay_cyclone(unsigned long loops) /* cyclone timer_opts struct */ struct timer_opts timer_cyclone = { + .name = "cyclone", .init = init_cyclone, .mark_offset = mark_offset_cyclone, .get_offset = get_offset_cyclone, diff --git a/arch/i386/kernel/timers/timer_hpet.c b/arch/i386/kernel/timers/timer_hpet.c index 3beb26646dea8..ccd3c43a3ac3f 100644 --- a/arch/i386/kernel/timers/timer_hpet.c +++ b/arch/i386/kernel/timers/timer_hpet.c @@ -178,6 +178,7 @@ static int __init init_hpet(char* override) /* tsc timer_opts struct */ struct timer_opts timer_hpet = { + .name = "hpet", .init = init_hpet, .mark_offset = mark_offset_hpet, .get_offset = get_offset_hpet, diff --git a/arch/i386/kernel/timers/timer_none.c b/arch/i386/kernel/timers/timer_none.c index 547c83ddbd9e0..de744f7bcbcf0 100644 --- a/arch/i386/kernel/timers/timer_none.c +++ b/arch/i386/kernel/timers/timer_none.c @@ -36,6 +36,7 @@ static void delay_none(unsigned long loops) /* tsc timer_opts struct */ struct timer_opts timer_none = { + .name = "none", .init = init_none, .mark_offset = mark_offset_none, .get_offset = get_offset_none, diff --git a/arch/i386/kernel/timers/timer_pit.c b/arch/i386/kernel/timers/timer_pit.c index 7d521228c28a7..7ddbf1c76d31e 100644 --- a/arch/i386/kernel/timers/timer_pit.c +++ b/arch/i386/kernel/timers/timer_pit.c @@ -149,6 +149,7 @@ static unsigned long get_offset_pit(void) /* tsc timer_opts struct */ struct timer_opts timer_pit = { + .name = "pit", .init = init_pit, .mark_offset = mark_offset_pit, .get_offset = get_offset_pit, diff --git a/arch/i386/kernel/timers/timer_tsc.c b/arch/i386/kernel/timers/timer_tsc.c index be9a2a533dd1e..ffb1afb1b9a39 100644 --- a/arch/i386/kernel/timers/timer_tsc.c +++ b/arch/i386/kernel/timers/timer_tsc.c @@ -472,6 +472,7 @@ __setup("notsc", tsc_setup); /* tsc timer_opts struct */ struct timer_opts timer_tsc = { + .name = "tsc", .init = init_tsc, .mark_offset = mark_offset_tsc, .get_offset = get_offset_tsc, diff --git a/include/asm-i386/timer.h b/include/asm-i386/timer.h index 21044fa48baa9..1727153c3570d 100644 --- a/include/asm-i386/timer.h +++ b/include/asm-i386/timer.h @@ -11,6 +11,7 @@ * last timer intruupt. */ struct timer_opts{ + char* name; int (*init)(char *override); void (*mark_offset)(void); unsigned long (*get_offset)(void); -- 2.53.0