From: Prarit Bhargava <prarit@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Prarit Bhargava <prarit@redhat.com>,
John Stultz <johnstul@us.ibm.com>,
Thomas Gleixner <tglx@linutronix.de>
Subject: [PATCH] Fix CONFIG_CLOCKSOURCE_WATCHDOG=n compile
Date: Wed, 11 Apr 2012 16:01:20 -0400 [thread overview]
Message-ID: <1334174480-16331-1-git-send-email-prarit@redhat.com> (raw)
Noticed this while debugging -- compile fails with
arch/x86/built-in.o: In function `mark_tsc_unstable':
/home/linux-2.6/arch/x86/kernel/tsc.c:791: undefined reference to
`clocksource_mark_unstable'
make: *** [.tmp_vmlinux1] Error 1
Add in an empty function for the !CONFIG_CLOCKSOURCE_WATCHDOG case.
Signed-off-by: Prarit Bhargava <prarit@redhat.com>
Cc: John Stultz <johnstul@us.ibm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
---
include/linux/clocksource.h | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index fbe89e1..dac8f91 100644
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -285,7 +285,13 @@ extern void clocksource_change_rating(struct clocksource *cs, int rating);
extern void clocksource_suspend(void);
extern void clocksource_resume(void);
extern struct clocksource * __init __weak clocksource_default_clock(void);
+#ifdef CONFIG_CLOCKSOURCE_WATCHDOG
extern void clocksource_mark_unstable(struct clocksource *cs);
+#else
+static inline void clocksource_mark_unstable(struct clocksource *cs)
+{
+}
+#endif
extern void
clocks_calc_mult_shift(u32 *mult, u32 *shift, u32 from, u32 to, u32 minsec);
--
1.7.1
next reply other threads:[~2012-04-11 20:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-11 20:01 Prarit Bhargava [this message]
2012-04-18 11:44 ` [PATCH] Fix CONFIG_CLOCKSOURCE_WATCHDOG=n compile Thomas Gleixner
2012-04-18 12:13 ` Prarit Bhargava
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1334174480-16331-1-git-send-email-prarit@redhat.com \
--to=prarit@redhat.com \
--cc=johnstul@us.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox