[PATCH] Fix compilation error in amd.c when SMP is not set

[PATCH] Fix compilation error in amd.c when SMP is not set

[Nicolas Palix]

The function amd_fixup_dcm requires SMP to be set
but it is called only when CONFIG_X86_HT is set.

It thus defined only if CONFIG_X86_HT is set.

Signed-off-by: Nicolas Palix <npalix@diku.dk>
---
 arch/x86/kernel/cpu/amd.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index e06fa7c..1c15916 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -256,6 +256,7 @@ static int __cpuinit nearby_node(int apicid)
  * Assumption 2: Mixed systems with both single-node and dual-node
  *               processors are not supported.
  */
+#ifdef CONFIG_X86_HT
 static void __cpuinit amd_fixup_dcm(struct cpuinfo_x86 *c)
 {
 	u32 t, cpn;
@@ -299,6 +300,7 @@ static void __cpuinit amd_fixup_dcm(struct cpuinfo_x86 *c)
 	 /* fixup core id to be in range from 0 to cpn */
 	c->cpu_core_id = c->cpu_core_id % cpn;
 }
+#endif
 
 /*
  * On a AMD dual core setup the lower bits of the APIC id distingush the cores.
-- 
1.6.0.4


-- 
Nicolas Palix

Re: [PATCH] Fix compilation error in amd.c when SMP is not set

[H. Peter Anvin]

On 07/31/2009 07:40 AM, Nicolas Palix wrote:
> The function amd_fixup_dcm requires SMP to be set
> but it is called only when CONFIG_X86_HT is set.
> 
> It thus defined only if CONFIG_X86_HT is set.
> 
> Signed-off-by: Nicolas Palix <npalix@diku.dk>

I'm confused... I don't see this function anywhere in my trees, nor do I
see git revision e06fa7c that this was based on either in my trees or
the stable trees.  What is the base rev of this patch?

	-hpa

-- 
H. Peter Anvin, Intel Open Source Technology Center
I work for Intel.  I don't speak on their behalf.

Re: [PATCH] Fix compilation error in amd.c when SMP is not set

[Nicolas Palix]

On Friday 31 July 2009 19:12:05 H. Peter Anvin wrote:
> On 07/31/2009 07:40 AM, Nicolas Palix wrote:
> > The function amd_fixup_dcm requires SMP to be set
> > but it is called only when CONFIG_X86_HT is set.
> > 
> > It thus defined only if CONFIG_X86_HT is set.
> > 
> > Signed-off-by: Nicolas Palix <npalix@diku.dk>
> 
> I'm confused... I don't see this function anywhere in my trees, nor do I
> see git revision e06fa7c that this was based on either in my trees or
> the stable trees.  What is the base rev of this patch?
> 
> 	-hpa
> 

It's in next, commit 29160dfe027e90532bd60a97db1dd158d996be8b.

It's broken since the 30 as also reported by
http://kisskb.ellerman.id.au/kisskb/target/629/


-- 
Nicolas Palix

Re: [PATCH] Fix compilation error in amd.c when SMP is not set

[Borislav Petkov]

On Fri, Jul 31, 2009 at 04:40:25PM +0200, Nicolas Palix wrote:
> The function amd_fixup_dcm requires SMP to be set
> but it is called only when CONFIG_X86_HT is set.
> 
> It thus defined only if CONFIG_X86_HT is set.
> 
> Signed-off-by: Nicolas Palix <npalix@diku.dk>

Thanks, I'll integrate it into the original patch:
29160dfe027e90532bd60a97db1dd158d996be8b.

-- 
Regards/Gruss,
    Boris.