Skip to contentSkip to conversation

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

PATCH In review James Bottomley 2 participants 4 messages Oct 30, 2008 – Nov 3, 2008 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fix compile breakage caused by x86: add ->pre_time_init to x86_quirks

Quoted 1 line

From da69eaed98248bf4b29e94d62a4e01a5c3758669 Mon Sep 17 00:00:00 2001

From: James Bottomley <[email protected]>
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 <[email protected]>
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.

---
 arch/x86/mach-voyager/setup.c |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)
arch/x86/mach-voyager/setup.c +11 -1
index 7c6ff1a..4cc0515 100644
@@ -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)
 {
 }
Signature · 1 line
1.5.6.5
#1 lore raw
Quoted 7 lines · James Bottomley
Quoted 1 line

From da69eaed98248bf4b29e94d62a4e01a5c3758669 Mon Sep 17 00:00:00 2001

From: James Bottomley <[email protected]>
Date: Wed, 29 Oct 2008 13:14:29 -0500
Subject: [VOYAGER] x86: add voyager pre_time_init_hook

This was introduced by:

Quoted 7 lines
Author: Yinghai Lu <[email protected]>
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

#2 lore raw
Quoted 12 lines · Ingo Molnar
Quoted 10 lines · James Bottomley
Quoted 1 line

From da69eaed98248bf4b29e94d62a4e01a5c3758669 Mon Sep 17 00:00:00 2001

From: James Bottomley <[email protected]>
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 <[email protected]>
Date:   Sat Jul 19 18:02:26 2008 -0700
Quoted 8 lines
Quoted 4 lines
    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

#3 lore raw
Quoted 18 lines · James Bottomley
Quoted 17 lines · Ingo Molnar
Quoted 14 lines · James Bottomley
Quoted 1 line

From da69eaed98248bf4b29e94d62a4e01a5c3758669 Mon Sep 17 00:00:00 2001

From: James Bottomley <[email protected]>
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 <[email protected]>
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.

Quoted 7 lines
Quoted 3 lines

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