From: Zachary Amsden <zach@vmware.com>
To: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Andrew Morton <akpm@osdl.org>, Andi Kleen <ak@muc.de>,
Rusty Russell <rusty@rustcorp.com.au>,
Jeremy Fitzhardinge <jeremy@goop.org>,
Chris Wright <chrisw@sous-sol.org>,
Zachary Amsden <zach@vmware.com>
Subject: [PATCH 5/11] Fix PIT override bug for paravirt
Date: Mon, 5 Feb 2007 19:53:02 -0800 [thread overview]
Message-ID: <200702060353.l163r2hU000745@zach-dev.vmware.com> (raw)
The time initialization changed for i386 when some code moved into time_init.
This made it no longer possible to override the PIT / HPET, which broke
paravirt guests.
Subject: Fix PIT override bug for paravirt
Signed-off-by: Zachary Amsden <zach@vmware.com>
diff -r acd12d5196c7 arch/i386/kernel/paravirt.c
--- a/arch/i386/kernel/paravirt.c Thu Feb 01 23:13:18 2007 -0800
+++ b/arch/i386/kernel/paravirt.c Thu Feb 01 23:19:36 2007 -0800
@@ -497,7 +497,7 @@ struct paravirt_ops paravirt_ops = {
.memory_setup = machine_specific_memory_setup,
.get_wallclock = native_get_wallclock,
.set_wallclock = native_set_wallclock,
- .time_init = time_init_hook,
+ .time_init = native_time_init,
.init_IRQ = native_init_IRQ,
.cpuid = native_cpuid,
diff -r acd12d5196c7 arch/i386/kernel/time.c
--- a/arch/i386/kernel/time.c Thu Feb 01 23:13:18 2007 -0800
+++ b/arch/i386/kernel/time.c Thu Feb 01 23:43:21 2007 -0800
@@ -268,10 +268,17 @@ static void __init hpet_time_init(void)
{
if (!hpet_enable())
setup_pit_timer();
- do_time_init();
-}
-
+ time_init_hook();
+}
+
+void __init native_time_init(void)
+{
+ late_time_init = hpet_time_init;
+}
+
+#ifndef CONFIG_PARAVIRT
void __init time_init(void)
{
- late_time_init = hpet_time_init;
-}
+ native_time_init();
+}
+#endif
diff -r acd12d5196c7 include/asm-i386/paravirt.h
--- a/include/asm-i386/paravirt.h Thu Feb 01 23:13:18 2007 -0800
+++ b/include/asm-i386/paravirt.h Thu Feb 01 23:17:27 2007 -0800
@@ -185,7 +185,7 @@ static inline int set_wallclock(unsigned
return paravirt_ops.set_wallclock(nowtime);
}
-static inline void do_time_init(void)
+static inline void time_init(void)
{
return paravirt_ops.time_init();
}
diff -r acd12d5196c7 include/asm-i386/time.h
--- a/include/asm-i386/time.h Thu Feb 01 23:13:18 2007 -0800
+++ b/include/asm-i386/time.h Thu Feb 01 23:43:29 2007 -0800
@@ -28,13 +28,14 @@ static inline int native_set_wallclock(u
return retval;
}
+extern void native_time_init(void);
+
#ifdef CONFIG_PARAVIRT
#include <asm/paravirt.h>
#else /* !CONFIG_PARAVIRT */
#define get_wallclock() native_get_wallclock()
#define set_wallclock(x) native_set_wallclock(x)
-#define do_time_init() time_init_hook()
#endif /* CONFIG_PARAVIRT */
next reply other threads:[~2007-02-06 3:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-02-06 3:53 Zachary Amsden [this message]
2007-02-06 12:30 ` Andi Kleen
2007-02-07 0:54 ` Zachary Amsden
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=200702060353.l163r2hU000745@zach-dev.vmware.com \
--to=zach@vmware.com \
--cc=ak@muc.de \
--cc=akpm@osdl.org \
--cc=chrisw@sous-sol.org \
--cc=jeremy@goop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rusty@rustcorp.com.au \
/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
all inboxes | Powered by JetHome®