From: James Bottomley <James.Bottomley@HansenPartnership.com>
Date: Sat, 10 May 2008 14:01:48 +0000 (-0500)
Subject: x86: [VOYAGER] fix duplicate phys_cpu_present_map symbol
X-Git-Tag: v2.6.26-rc3~68^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8955ebe3ea85a9d3ff2685ee64386fd34434cf3;p=pandora-kernel.git

x86: [VOYAGER] fix duplicate phys_cpu_present_map symbol

The phys_cpu_present_map is an expected symbol in the SMP harness.
Unfortunately, x86 recently moved this and a few others to
kernel/setup.c where it doesn't quite work because voyager has to
define its own.  Use CONFIG_X86_LOCAL_APIC to isolate these
definitions and fix up another area in setup.c where CONFIG_X86_SMP
should be used instead of CONFIG_SMP.

Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: WANG Cong <xiyou.wangcong@gmail.com>
Cc: toralf.foerster@gmx.de
Cc: Mike Travis <travis@sgi.com>
Cc: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

Reading git-diff-tree failed