From: James Bottomley <James.Bottomley@HansenPartnership.com>
To: linux-kernel <linux-kernel@vger.kernel.org>
Cc: Yinghai Lu <yhlu.kernel@gmail.com>
Subject: [PATCH] fix compile breakage caused by x86: add ->pre_time_init to x86_quirks
Date: Thu, 30 Oct 2008 16:07:11 -0500 [thread overview]
Message-ID: <1225400831.19324.21.camel@localhost.localdomain> (raw)
>From da69eaed98248bf4b29e94d62a4e01a5c3758669 Mon Sep 17 00:00:00 2001
From: James Bottomley <James.Bottomley@HansenPartnership.com>
Date: Wed, 29 Oct 2008 13:14:29 -0500
Subject: [VOYAGER] x86: add voyager pre_time_init_hook
This was introduced by:
Author: Yinghai Lu <yhlu.kernel@gmail.com>
Date: Sat Jul 19 18:02:26 2008 -0700
x86: add ->pre_time_init to x86_quirks
In theory, voyager could also make use of the x86_quirks hooks but,
unfortunately, they're not set up correctly for that to happen yet.
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
---
arch/x86/mach-voyager/setup.c | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/arch/x86/mach-voyager/setup.c b/arch/x86/mach-voyager/setup.c
index 7c6ff1a..4cc0515 100644
--- a/arch/x86/mach-voyager/setup.c
+++ b/arch/x86/mach-voyager/setup.c
@@ -34,13 +34,23 @@ void __init intr_init_hook(void)
setup_irq(2, &irq2);
}
-void __init pre_setup_arch_hook(void)
+static void voyager_disable_tsc(void)
{
/* Voyagers run their CPUs from independent clocks, so disable
* the TSC code because we can't sync them */
setup_clear_cpu_cap(X86_FEATURE_TSC);
}
+void __init pre_setup_arch_hook(void)
+{
+ voyager_disable_tsc();
+}
+
+void __init pre_time_init_hook(void)
+{
+ voyager_disable_tsc();
+}
+
void __init trap_init_hook(void)
{
}
--
1.5.6.5
next reply other threads:[~2008-10-30 21:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-30 21:07 James Bottomley [this message]
2008-10-30 22:23 ` Ingo Molnar
2008-10-31 17:47 ` James Bottomley
2008-11-03 9:46 ` Ingo Molnar
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=1225400831.19324.21.camel@localhost.localdomain \
--to=james.bottomley@hansenpartnership.com \
--cc=linux-kernel@vger.kernel.org \
--cc=yhlu.kernel@gmail.com \
/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®