Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753310AbdCMUnI (ORCPT ); Mon, 13 Mar 2017 16:43:08 -0400 Received: from terminus.zytor.com ([65.50.211.136]:49192 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752969AbdCMUnA (ORCPT ); Mon, 13 Mar 2017 16:43:00 -0400 Date: Mon, 13 Mar 2017 13:42:50 -0700 From: tip-bot for Dou Liyang Message-ID: Cc: mingo@kernel.org, tglx@linutronix.de, douly.fnst@cn.fujitsu.com, linux-kernel@vger.kernel.org, hpa@zytor.com Reply-To: tglx@linutronix.de, mingo@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, douly.fnst@cn.fujitsu.com In-Reply-To: <1488805690-5055-1-git-send-email-douly.fnst@cn.fujitsu.com> References: <1488805690-5055-1-git-send-email-douly.fnst@cn.fujitsu.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] x86/apic: Fix a comment in init_apic_mappings() Git-Commit-ID: ad258524b64756834f5fe23620beedb7c3609dc8 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1637 Lines: 43 Commit-ID: ad258524b64756834f5fe23620beedb7c3609dc8 Gitweb: http://git.kernel.org/tip/ad258524b64756834f5fe23620beedb7c3609dc8 Author: Dou Liyang AuthorDate: Mon, 6 Mar 2017 21:08:10 +0800 Committer: Thomas Gleixner CommitDate: Mon, 13 Mar 2017 21:40:14 +0100 x86/apic: Fix a comment in init_apic_mappings() commit c0104d38a740 ("x86, apic: Unify identical register_lapic_address() functions") renames acpi_register_lapic_address to register_lapic_address. But acpi_register_lapic_address remains in a comment, and renaming it to register_lapic_address is not suitable for this comment. Remove acpi_register_lapic_address and rewrite the comment. [ tglx: LAPIC address can be registered either by ACPI/MADT or MP info ] Signed-off-by: Dou Liyang Cc: yinghai@kernel.org Link: http://lkml.kernel.org/r/1488805690-5055-1-git-send-email-douly.fnst@cn.fujitsu.com Signed-off-by: Thomas Gleixner --- arch/x86/kernel/apic/apic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index aee7ded..100c43f 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -1789,8 +1789,8 @@ void __init init_apic_mappings(void) apic_phys = mp_lapic_addr; /* - * acpi lapic path already maps that address in - * acpi_register_lapic_address() + * If the system has ACPI MADT tables or MP info, the LAPIC + * address is already registered. */ if (!acpi_lapic && !smp_found_config) register_lapic_address(apic_phys);