[PATCH] Be verbose about the ia32 time source

From: john stultz <johnstul@us.ibm.com>

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.

diff --git a/arch/i386/kernel/time.c b/arch/i386/kernel/time.c
index 3ab55d36acde43b16885af7d3c8f3c70ca64306b..1351b4c431d60a556e4534e5c3354f547c1ee215 100644 (file)
--- 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 2dd4398ec037fe70e175bf6c37eefc6df484a189..d081539d5693feafaac7448d85fc4eab2a400100 100644 (file)
--- 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 3beb26646dea83867f749de70de6dea4eb8bf18a..ccd3c43a3ac3fe5d4f939a2778eee351de044756 100644 (file)
--- 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 547c83ddbd9e085e79d04d4a2b81fc5c3bfba94e..de744f7bcbcf07c3d28c036bec71a305dff87393 100644 (file)
--- 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 7d521228c28a7a9e11577f1ebdfa38540ac9c5ef..7ddbf1c76d31e8929547a24aa04f4e2f11239981 100644 (file)
--- 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 be9a2a533dd1e0dfad25032dc2833147fdfff386..ffb1afb1b9a3951957229e17714546226bd32749 100644 (file)
--- 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 21044fa48baa9cbfb890159865002cb7c546675a..1727153c3570dd2ffe683aa6fa89831e91852e6a 100644 (file)
--- 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);