[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <497E9B9D.4010102@gmail.com>
Date:	Tue, 27 Jan 2009 14:29:01 +0900
From:	Tejun Heo <htejun@...il.com>
To:	James Bottomley <James.Bottomley@...senPartnership.com>
CC:	Ingo Molnar <mingo@...e.hu>, Brian Gerst <brgerst@...il.com>,
	linux-kernel@...r.kernel.org
Subject: [PATCH 1/2 #tj-percpu] x86: fix build breakage on voyage
From: James Bottomley <James.Bottomley@...senPartnership.com>
Impact: build fix
x86_cpu_to_apicid and x86_bios_cpu_apicid aren't defined for voyage.
Earlier patch forgot to conditionalize early percpu clearing.  Fix it.
Signed-off-by: James Bottomley <James.Bottomley@...senPartnership.com>
Signed-off-by: Tejun Heo <tj@...nel.org>
---
These two patches have been merged into #tj-percpu.  Thanks.
 arch/x86/kernel/setup_percpu.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
index 4caa78d..c7458ea 100644
--- a/arch/x86/kernel/setup_percpu.c
+++ b/arch/x86/kernel/setup_percpu.c
@@ -125,8 +125,10 @@ void __init setup_per_cpu_areas(void)
 	}
 
 	/* indicate the early static arrays will soon be gone */
+#ifdef CONFIG_X86_LOCAL_APIC
 	early_per_cpu_ptr(x86_cpu_to_apicid) = NULL;
 	early_per_cpu_ptr(x86_bios_cpu_apicid) = NULL;
+#endif
 #if defined(CONFIG_X86_64) && defined(CONFIG_NUMA)
 	early_per_cpu_ptr(x86_cpu_to_node_map) = NULL;
 #endif
-- 
1.6.0.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
Powered by blists - more mailing lists
 
