From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753836Ab0JXBGu (ORCPT ); Sat, 23 Oct 2010 21:06:50 -0400 Received: from rcsinet10.oracle.com ([148.87.113.121]:48225 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759030Ab0JXBFH (ORCPT ); Sat, 23 Oct 2010 21:05:07 -0400 From: Yinghai Lu To: Ingo Molnar , Thomas Gleixner , "H. Peter Anvin" Cc: Andrew Morton , Len Brown , linux-kernel@vger.kernel.org, Yinghai Lu Subject: [PATCH 07/15] x86, sfi: Use smp_register_lapic_address() Date: Sat, 23 Oct 2010 18:02:21 -0700 Message-Id: <1287882149-29275-8-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1287882149-29275-1-git-send-email-yinghai@kernel.org> References: <1287882149-29275-1-git-send-email-yinghai@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org kill mp_sfi_register_lapic_address, they are the same Signed-off-by: Yinghai Lu --- arch/x86/kernel/sfi.c | 13 +------------ 1 files changed, 1 insertions(+), 12 deletions(-) diff --git a/arch/x86/kernel/sfi.c b/arch/x86/kernel/sfi.c index dd4c281..4dc8065 100644 --- a/arch/x86/kernel/sfi.c +++ b/arch/x86/kernel/sfi.c @@ -34,17 +34,6 @@ #ifdef CONFIG_X86_LOCAL_APIC static unsigned long sfi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE; -static void __init mp_sfi_register_lapic_address(unsigned long address) -{ - mp_lapic_addr = address; - - set_fixmap_nocache(FIX_APIC_BASE, mp_lapic_addr); - if (boot_cpu_physical_apicid == -1U) - boot_cpu_physical_apicid = read_apic_id(); - - pr_info("Boot CPU = %d\n", boot_cpu_physical_apicid); -} - /* All CPUs enumerated by SFI must be present and enabled */ static void __cpuinit mp_sfi_register_lapic(u8 id) { @@ -110,7 +99,7 @@ static int __init sfi_parse_ioapic(struct sfi_table_header *table) int __init sfi_platform_init(void) { #ifdef CONFIG_X86_LOCAL_APIC - mp_sfi_register_lapic_address(sfi_lapic_addr); + smp_register_lapic_address(sfi_lapic_addr); sfi_table_parse(SFI_SIG_CPUS, NULL, NULL, sfi_parse_cpus); #endif #ifdef CONFIG_X86_IO_APIC -- 1.7.1