Skip to contentSkip to conversation

fix compile breakage casued by x86: move prefill_possible_map calling early

PATCH Applied James Bottomley 2 participants 2 messages Oct 30, 2008 x86

lore
Share & tools
lore

James Bottomley

author
#0 lore raw

PATCH 1/1 fix compile breakage casued by x86: move prefill_possible_map calling early

Quoted 1 line

From 2947cdda39c36e5a0d56fe0c6b70a17526abb5b5 Mon Sep 17 00:00:00 2001

From: James Bottomley <[email protected]>
Date: Thu, 30 Oct 2008 15:51:22 -0500
Subject: [VOYAGER] add prefill_possible_mask() to fix linker breakage

Before

commit 329513a35d1a2b6b28d54f5c2c0dde4face8200b

Author: Yinghai Lu <[email protected]>
Date:   Wed Jul 2 18:54:40 2008 -0700

x86: move prefill_possible_map calling early

prefill_possible_mask() was hidden under CONFIG_HOTPLUG_CPU rendering it invisitble to voyager. Since this commit it's exposed, but not provided by the voyager subarch, so add a dummy stub to fix the link breakage.

Signed-off-by James Bottomley <[email protected]>
---
 arch/x86/mach-voyager/voyager_smp.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
arch/x86/mach-voyager/voyager_smp.c +6 -0
index 761d491..ece93b1 100644
@@ -346,6 +346,12 @@ static void do_quad_bootstrap(void)
 	}
 }
 
+void prefill_possible_map(void)
+{
+	/* This is empty on voyager because we need a much
+	 * earlier detection which is done in find_smp_config */
+}
+
 /* Set up all the basic stuff: read the SMP config and make all the
  * SMP information reflect only the boot cpu.  All others will be
  * brought on-line later. */
Signature · 1 line
1.5.6.5
Applied
#1 lore raw
Quoted 18 lines · James Bottomley
Quoted 1 line

From 2947cdda39c36e5a0d56fe0c6b70a17526abb5b5 Mon Sep 17 00:00:00 2001

From: James Bottomley <[email protected]>
Date: Thu, 30 Oct 2008 15:51:22 -0500
Subject: [VOYAGER] add prefill_possible_mask() to fix linker breakage

Before

commit 329513a35d1a2b6b28d54f5c2c0dde4face8200b

Author: Yinghai Lu <[email protected]>
Date:   Wed Jul 2 18:54:40 2008 -0700

x86: move prefill_possible_map calling early

prefill_possible_mask() was hidden under CONFIG_HOTPLUG_CPU rendering it invisitble to voyager. Since this commit it's exposed, but not provided by the voyager subarch, so add a dummy stub to fix the link breakage.

Quoted 4 lines
Signed-off-by James Bottomley <[email protected]>
---
 arch/x86/mach-voyager/voyager_smp.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

applied to tip/x86/urgent, thanks James!

these kinds of problems will go away too when x86/Voyager becomes part of the regular platform code.

Ingo