[PATCH] fix compile breakage caused by x86: add ->pre_time_init to x86_quirks

[PATCH] fix compile breakage caused by x86: add ->pre_time_init to x86_quirks

[James Bottomley]

>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

Re: [PATCH] fix compile breakage caused by x86: add ->pre_time_init to x86_quirks

[Ingo Molnar]

* James Bottomley <James.Bottomley@HansenPartnership.com> wrote:

> >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.

okay, so how about setting them up that way instead? That way we win 
twice: it becomes a tiny bit easier to add Voyager support to the 
generic platform code, and we also fix the build breakage.

	Ingo

Re: [PATCH] fix compile breakage caused by x86: add ->pre_time_init to x86_quirks

[James Bottomley]

On Thu, 2008-10-30 at 23:23 +0100, Ingo Molnar wrote:
> * James Bottomley <James.Bottomley@HansenPartnership.com> wrote:
> 
> > >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.
> 
> okay, so how about setting them up that way instead? That way we win 
> twice: it becomes a tiny bit easier to add Voyager support to the 
> generic platform code, and we also fix the build breakage.

Sure, it should be possible ... but reworking the current quirk
infrastructure would definitely be an enhancement, whereas this is a
compile fix for 2.6.28-rc

James

Re: [PATCH] fix compile breakage caused by x86: add ->pre_time_init to x86_quirks

[Ingo Molnar]

* James Bottomley <James.Bottomley@HansenPartnership.com> wrote:

> On Thu, 2008-10-30 at 23:23 +0100, Ingo Molnar wrote:
> > * James Bottomley <James.Bottomley@HansenPartnership.com> wrote:
> > 
> > > >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.
> > 
> > okay, so how about setting them up that way instead? That way we win 
> > twice: it becomes a tiny bit easier to add Voyager support to the 
> > generic platform code, and we also fix the build breakage.
> 
> Sure, it should be possible ... but reworking the current quirk 
> infrastructure would definitely be an enhancement, whereas this is a 
> compile fix for 2.6.28-rc

but it's an ugly compile fix that just prolongues the pain that the 
subarch code has been inflicting on us for many cycles. Please fix the 
underlying problem properly - it should not be hard and it will 
definitely be cleaner end result.

	Ingo