From: "Andi Kleen" <ak@suse.de>

Fix a warning in the CMP support code for !CONFIG_NUMA

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 25-akpm/arch/x86_64/kernel/setup.c |    2 ++
 1 files changed, 2 insertions(+)

diff -puN arch/x86_64/kernel/setup.c~x86_64-fix-a-warning-in-the-cmp-support-code-for arch/x86_64/kernel/setup.c
--- 25/arch/x86_64/kernel/setup.c~x86_64-fix-a-warning-in-the-cmp-support-code-for	2004-11-28 01:54:47.115434472 -0800
+++ 25-akpm/arch/x86_64/kernel/setup.c	2004-11-28 01:54:47.120433712 -0800
@@ -679,7 +679,9 @@ static int __init init_amd(struct cpuinf
 {
 	int r;
 	int level;
+#ifdef CONFIG_NUMA
 	int cpu;
+#endif
 
 	/* Bit 31 in normal CPUID used for nonstandard 3DNow ID;
 	   3DNow is IDd by bit 31 in extended CPUID (1*32+31) anyway */
_