x86, clocksource, fix !CONFIG_CLOCKSOURCE_WATCHDOG compile
PATCH 1/1 x86, clocksource, fix !CONFIG_CLOCKSOURCE_WATCHDOG compile
If I explicitly disable the clocksource watchdog in the x86 Kconfig, the x86 kernel will not compile unless this is properly defined.
--- kernel/time/clocksource.c | 1 + 1 file changed, 1 insertion(+)
kernel/time/clocksource.c +1 -0
@@ -450,6 +450,7 @@ static void clocksource_enqueue_watchdog(struct clocksource *cs)static inline void clocksource_dequeue_watchdog (struct clocksource *cs) { }static inline void clocksource_resume_watchdog (void ) { }static inline int clocksource_watchdog_kthread (void *data) {return 0 ; } +void clocksource_mark_unstable (struct clocksource *cs) { }#endif /* CONFIG_CLOCKSOURCE_WATCHDOG */
Signature · 1 line
1.7.9.3
Quoted 2 lines · Prarit Bhargava
If I explicitly disable the clocksource watchdog in the x86
Kconfig, the x86 kernel will not compile unless this is properly defined.
You shouldn't do that. :)
Quoted 13 lines
Signed-off-by Prarit Bhargava <[email protected]>Cc John Stultz <[email protected]>Cc Thomas Gleixner <[email protected]>--- kernel/time/clocksource.c | 1 + 1 file changed, 1 insertion(+)kernel/time/clocksource.c +0
-0
kernel/time/clocksource.c static void clocksource_enqueue_watchdog(struct clocksource *cs) · line 453
Quoted 4 lines
kernel/time/clocksource.c +1
-0@@ -450,6 +450,7 @@ static void clocksource_enqueue_watchdog(struct clocksource *cs)static inline void clocksource_dequeue_watchdog (struct clocksource *cs) { }static inline void clocksource_resume_watchdog (void ) { }static inline int clocksource_watchdog_kthread (void *data) {return 0 ; } +void clocksource_mark_unstable (struct clocksource *cs) { }
Unless this is defined as
kernel/time/clocksource.c static void clocksource_enqueue_watchdog(struct clocksource *cs) · line 454
Quoted 1 line
kernel/time/clocksource.c +1
-0+static inline void clocksource_mark_unstable (struct clocksource *cs) { }
Right?
tglx
Quoted 7 lines · Thomas Gleixner
Quoted 1 line
+void
clocksource_mark_unstable(struct clocksource *cs){ }Unless this is defined as
Quoted 1 line
+static inline void
clocksource_mark_unstable(struct clocksource *cs){ }Right?
Whups. Of course ... new patch ...
-----8<----
If I explicitly disable the clocksource watchdog in the x86 Kconfig, the x86 kernel will not compile unless this is properly defined.
--- kernel/time/clocksource.c | 1 + 1 file changed, 1 insertion(+)
kernel/time/clocksource.c +1 -0
@@ -450,6 +450,7 @@ static void clocksource_enqueue_watchdog(struct clocksource *cs)static inline void clocksource_dequeue_watchdog (struct clocksource *cs) { }static inline void clocksource_resume_watchdog (void ) { }static inline int clocksource_watchdog_kthread (void *data) {return 0 ; } +static inline void clocksource_mark_unstable (struct clocksource *cs) { }#endif /* CONFIG_CLOCKSOURCE_WATCHDOG */
Signature · 1 line
1.7.9.3
Quoted 29 lines · Prarit Bhargava
Quoted 7 lines · Thomas Gleixner
Quoted 1 line
+void
clocksource_mark_unstable(struct clocksource *cs){ }Unless this is defined as
Quoted 1 line
+static inline void
clocksource_mark_unstable(struct clocksource *cs){ }Right?
Whups. Of course ... new patch ...
-----8<----
If I explicitly disable the clocksource watchdog in the x86
Kconfig, the x86 kernel will not compile unless this is properly defined.Signed-off-by Prarit Bhargava <[email protected]>Cc John Stultz <[email protected]>Cc Thomas Gleixner <[email protected]>--- kernel/time/clocksource.c | 1 + 1 file changed, 1 insertion(+)kernel/time/clocksource.c +0
-0
kernel/time/clocksource.c static void clocksource_enqueue_watchdog(struct clocksource *cs) · line 455
Quoted 6 lines
kernel/time/clocksource.c +1
-0@@ -450,6 +450,7 @@ static void clocksource_enqueue_watchdog(struct clocksource *cs)static inline void clocksource_dequeue_watchdog (struct clocksource *cs) { }static inline void clocksource_resume_watchdog (void ) { }static inline int clocksource_watchdog_kthread (void *data) {return 0 ; } +static inline void clocksource_mark_unstable (struct clocksource *cs) { }#endif /* CONFIG_CLOCKSOURCE_WATCHDOG */
Yuck. Self NACK this one ... sorry Thomas. I'm going to have to do more work on this patch ...
P.
Quoted 1 line
Quoted 27 lines · Thomas Gleixner
Quoted 2 lines · Prarit Bhargava
If I explicitly disable the clocksource watchdog in the x86
Kconfig, the x86 kernel will not compile unless this is properly defined.You shouldn't do that. :)
Quoted 13 lines
Signed-off-by Prarit Bhargava <[email protected]>Cc John Stultz <[email protected]>Cc Thomas Gleixner <[email protected]>--- kernel/time/clocksource.c | 1 + 1 file changed, 1 insertion(+)kernel/time/clocksource.c +0
-0kernel/time/clocksource.c static void clocksource_enqueue_watchdog(struct clocksource *cs) · line 453
Quoted 4 lines
kernel/time/clocksource.c +1
-0@@ -450,6 +450,7 @@ static void clocksource_enqueue_watchdog(struct clocksource *cs)static inline void clocksource_dequeue_watchdog (struct clocksource *cs) { }static inline void clocksource_resume_watchdog (void ) { }static inline int clocksource_watchdog_kthread (void *data) {return 0 ; } +void clocksource_mark_unstable (struct clocksource *cs) { }Unless this is defined as
Quoted 3 lines
kernel/time/clocksource.c static void clocksource_enqueue_watchdog(struct clocksource *cs) · line 454
Quoted 1 line
kernel/time/clocksource.c +1
-0+static inline void clocksource_mark_unstable (struct clocksource *cs) { }Right?
Thomas,
Actually that needs to be "void clocksource_mark_unstable()" as it is exported in include/linux/clocksource.h as such.
The other static inline functions above it are only used in clocksource.c.
So I think my patch is correct ...
P.
Quoted 2 lines
tglx
Quoted 1 line · Prarit Bhargava
If I explicitly disable the clocksource watchdog in the x86
Kconfig,
And why do you want to do that?
Quoted 26 lines
the x86 kernel will not compile unless this is properly defined.
Signed-off-by Prarit Bhargava <[email protected]>Cc John Stultz <[email protected]>Cc Thomas Gleixner <[email protected]>--- kernel/time/clocksource.c | 1 + 1 file changed, 1 insertion(+)kernel/time/clocksource.c +1
-0@@ -450,6 +450,7 @@ static void clocksource_enqueue_watchdog(struct clocksource *cs)static inline void clocksource_dequeue_watchdog (struct clocksource *cs) { }static inline void clocksource_resume_watchdog (void ) { }static inline int clocksource_watchdog_kthread (void *data) {return 0 ; } +void clocksource_mark_unstable (struct clocksource *cs) { }#endif /* CONFIG_CLOCKSOURCE_WATCHDOG */ Signature · 1 line
1.7.9.3
Quoted 5 lines · Thomas Gleixner
Quoted 1 line · Prarit Bhargava
If I explicitly disable the clocksource watchdog in the x86
Kconfig,And why do you want to do that?
Hey Thomas, I was debugging something and stumbled across this.
IIRC the issue was that there some weirdness on a series of new AMD systems and unfortunately the watchdog would fire and switch clocksources on me :( That resulted in me not being able to debug the HW because the clocksource I wanted was no longer available.
P.
Quoted 27 lines
Quoted 27 lines
the x86 kernel will not compile unless this is properly defined.
Signed-off-by Prarit Bhargava <[email protected]>Cc John Stultz <[email protected]>Cc Thomas Gleixner <[email protected]>--- kernel/time/clocksource.c | 1 + 1 file changed, 1 insertion(+)kernel/time/clocksource.c +1
-0@@ -450,6 +450,7 @@ static void clocksource_enqueue_watchdog(struct clocksource *cs)static inline void clocksource_dequeue_watchdog (struct clocksource *cs) { }static inline void clocksource_resume_watchdog (void ) { }static inline int clocksource_watchdog_kthread (void *data) {return 0 ; } +void clocksource_mark_unstable (struct clocksource *cs) { }#endif /* CONFIG_CLOCKSOURCE_WATCHDOG */ Signature · 1 line
1.7.9.3
Quoted 7 lines · Prarit Bhargava
Quoted 4 lines · Thomas Gleixner
Quoted 1 line · Prarit Bhargava
If I explicitly disable the clocksource watchdog in the x86
Kconfig,
Quoted 8 lines
Quoted 1 line
And why do you want to do that?
Hey Thomas, I was debugging something and stumbled across this.
IIRC the issue was that there some weirdness on a series of new AMD systems and unfortunately the watchdog would fire and switch clocksources on me :( That resulted in me not being able to debug the HW because the clocksource I wanted was no longer available.
tsc=reliable on the kernel command line kills the watchdog requirement.
Thanks,
tglx
Quoted 2 lines · Prarit Bhargava
If I explicitly disable the clocksource watchdog in the x86
Kconfig, the x86 kernel will not compile unless this is properly defined.
Going through my backlog, I noticed I never picked this up. Queued for 3.12.
thanks
-john