From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755359Ab0HNUgU (ORCPT ); Sat, 14 Aug 2010 16:36:20 -0400 Received: from rcsinet10.oracle.com ([148.87.113.121]:19545 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755182Ab0HNUgT (ORCPT ); Sat, 14 Aug 2010 16:36:19 -0400 Message-ID: <4C66FDF4.3070605@kernel.org> Date: Sat, 14 Aug 2010 13:35:00 -0700 From: Yinghai Lu User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.11) Gecko/20100714 SUSE/3.0.6 Thunderbird/3.0.6 MIME-Version: 1.0 To: Ingo Molnar , Thomas Gleixner , "H. Peter Anvin" CC: Andrew Morton , "Eric W. Biederman" , linux-kernel@vger.kernel.org, Yinghai Lu Subject: [PATCH -v2 08/10] x86: !find_smp_config path use smp_register_lapic_address References: <1281147343-18389-1-git-send-email-yinghai@kernel.org> In-Reply-To: <1281147343-18389-1-git-send-email-yinghai@kernel.org> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org so fixmap will be setup there. -v2: fix typo Signed-off-by: Yinghai Lu --- arch/x86/kernel/apic/apic.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index 3d3d3da..2c9aa63 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -1477,7 +1477,7 @@ static int __init detect_init_APIC(void) return -1; } - mp_lapic_addr = APIC_DEFAULT_PHYS_BASE; + smp_register_lapic_address(APIC_DEFAULT_PHYS_BASE); return 0; } #else @@ -1487,6 +1487,7 @@ static int __init detect_init_APIC(void) static int __init detect_init_APIC(void) { u32 h, l, features; + unsigned long lapic_addr; /* Disabled by kernel option? */ if (disable_apic) @@ -1541,13 +1542,14 @@ static int __init detect_init_APIC(void) return -1; } set_cpu_cap(&boot_cpu_data, X86_FEATURE_APIC); - mp_lapic_addr = APIC_DEFAULT_PHYS_BASE; + lapic_addr = APIC_DEFAULT_PHYS_BASE; /* The BIOS may have set up the APIC at some other address */ rdmsr(MSR_IA32_APICBASE, l, h); if (l & MSR_IA32_APICBASE_ENABLE) - mp_lapic_addr = l & MSR_IA32_APICBASE_BASE; + lapic_addr = l & MSR_IA32_APICBASE_BASE; + smp_register_lapic_address(lapic_addr); pr_info("Found and enabled local APIC!\n"); apic_pm_activate(); -- 1.6.4.2