Yinghai Lu d8c7eb34c2 x86: Don't use current_cpu_data in x2apic phys_pkg_id ... One system has socket 1 come up as BSP. kexeced kernel reports BSP as: [ 1.524550] Initializing cgroup subsys cpuacct [ 1.536064] initial_apicid:20 [ 1.537135] ht_mask_width:1 [ 1.538128] core_select_mask:f [ 1.539126] core_plus_mask_width:5 [ 1.558479] CPU: Physical Processor ID: 0 [ 1.559501] CPU: Processor Core ID: 0 [ 1.560539] CPU: L1 I cache: 32K, L1 D cache: 32K [ 1.579098] CPU: L2 cache: 256K [ 1.580085] CPU: L3 cache: 24576K [ 1.581108] CPU 0/0x20 -> Node 0 [ 1.596193] CPU 0 microcode level: 0xffff0008 It doesn't have correct physical processor id and will get an error: [ 38.840859] CPU0 attaching sched-domain: [ 38.848287] domain 0: span 0,8,72 level SIBLING [ 38.851151] groups: 0 8 72 [ 38.858137] domain 1: span 0,8-15,72-79 level MC [ 38.868944] groups: 0,8,72 9,73 10,74 11,75 12,76 13,77 14,78 15,79 [ 38.881383] ERROR: parent span is not a superset of domain->span [ 38.890724] domain 2: span 0-7,64-71 level CPU [ 38.899237] ERROR: domain->groups does not contain CPU0 [ 38.909229] groups: 8-15,72-79 [ 38.912547] ERROR: groups don't span domain->span [ 38.919665] domain 3: span 0-127 level NODE [ 38.930739] groups: 0-7,64-71 8-15,72-79 16-23,80-87 24-31,88-95 32-39,96-103 40-47,104-111 48-55,112-119 56-63,120-127 it turns out: we can not use current_cpu_data in phys_pgd_id for x2apic. identify_boot_cpu() is called by check_bugs() before smp_prepare_cpus() and till smp_prepare_cpus() current_cpu_data for bsp is assigned with boot_cpu_data. Just make phys_pkg_id for x2apic is aligned to xapic. Signed-off-by: Yinghai Lu <yinghai@kernel.org> Acked-by: Suresh Siddha <suresh.b.siddha@intel.com> Cc: Andrew Morton <akpm@linux-foundation.org> LKML-Reference: <4A6ADD0D.10002@kernel.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-08-04 16:22:44 +02:00
..
boot	x86: fix usage of bios intcall()	2009-07-04 12:56:32 -07:00
configs	Merge branch 'x86-kbuild-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-06-10 15:30:41 -07:00
crypto	crypto: aes-ni - Remove CRYPTO_TFM_REQ_MAY_SLEEP from fpu template	2009-06-18 19:44:01 +08:00
ia32	Merge branch 'core/signal' into perfcounters/core	2009-04-30 21:16:49 +02:00
include/asm	x86, UV: Fix macros for accessing large node numbers	2009-08-04 16:19:14 +02:00
kernel	x86: Don't use current_cpu_data in x2apic phys_pkg_id	2009-08-04 16:22:44 +02:00
kvm	KVM: shut up uninit compiler warning in paging_tmpl.h	2009-06-28 14:10:32 +03:00
lguest	lguest: restrict CPUID to avoid perf counter wrmsr	2009-07-17 21:47:45 +09:30
lib	x86, msr: execute on the correct CPU subset	2009-08-03 14:48:13 -07:00
math-emu	Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2	2009-03-27 17:28:43 +01:00
mm	x86: Fix CPA memtype reserving in the set_pages_array*() cases	2009-08-03 19:36:09 +02:00
oprofile	x86/oprofile: rename kernel parameter for architectural perfmon to arch_perfmon	2009-07-10 05:22:50 +02:00
pci	x86/pci: insert ioapic resource before assigning unassigned resources	2009-07-10 13:03:14 -07:00
power	x86: Fix resume from suspend when CONFIG_CC_STACKPROTECTOR	2009-07-08 13:20:13 +02:00
vdso	gcov: enable GCOV_PROFILE_ALL for x86_64	2009-06-18 13:03:58 -07:00
video
xen	Merge branch 'x86-xen-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-06-10 16:16:27 -07:00
Kbuild	x86: standardize Kbuild rules	2009-04-16 18:09:02 +02:00
Kconfig	intel-iommu: Restore DMAR_BROKEN_GFX_WA option for broken graphics drivers	2009-07-04 10:59:46 +01:00
Kconfig.cpu	Revert "x86, bts: reenable ptrace branch trace support"	2009-06-11 00:32:00 +02:00
Kconfig.debug	kmemcheck: make kconfig accessible for other architectures	2009-06-15 15:49:17 +02:00
Makefile	kmemcheck: add the kmemcheck core	2009-06-13 15:37:30 +02:00
Makefile_32.cpu