diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-09-10 00:02:02 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-09-10 00:02:02 +0200 |
| commit | bf992fa2bc1ad1bb2aeb0bdfadb43f236b9297fd (patch) | |
| tree | d67f525c76b66956ba7ca0d40bc0fcda0e414700 /arch/x86/kernel/apic/probe_64.c | |
| parent | 9d7302299ee96ca954fe4ab8ca640333b6e19ad0 (diff) | |
| parent | 7135a71b19be1faf48b7148d77844d03bc0717d6 (diff) | |
| download | linux-bf992fa2bc1ad1bb2aeb0bdfadb43f236b9297fd.tar.bz2 | |
Merge branch 'master' into for-linus
Diffstat (limited to 'arch/x86/kernel/apic/probe_64.c')
| -rw-r--r-- | arch/x86/kernel/apic/probe_64.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic/probe_64.c b/arch/x86/kernel/apic/probe_64.c index bc3e880f9b82..fcec2f1d34a1 100644 --- a/arch/x86/kernel/apic/probe_64.c +++ b/arch/x86/kernel/apic/probe_64.c @@ -44,6 +44,11 @@ static struct apic *apic_probe[] __initdata = { NULL, }; +static int apicid_phys_pkg_id(int initial_apic_id, int index_msb) +{ + return hard_smp_processor_id() >> index_msb; +} + /* * Check the APIC IDs in bios_cpu_apicid and choose the APIC mode. */ @@ -69,6 +74,11 @@ void __init default_setup_apic_routing(void) printk(KERN_INFO "Setting APIC routing to %s\n", apic->name); } + if (is_vsmp_box()) { + /* need to update phys_pkg_id */ + apic->phys_pkg_id = apicid_phys_pkg_id; + } + /* * Now that apic routing model is selected, configure the * fault handling for intr remapping. |