[tip:timers/core] x86/apic: Fix a comment in init_apic_mappings()
From: tip-bot for Dou Liyang
Date: Mon Mar 13 2017 - 16:43:11 EST
Commit-ID: ad258524b64756834f5fe23620beedb7c3609dc8
Gitweb: http://git.kernel.org/tip/ad258524b64756834f5fe23620beedb7c3609dc8
Author: Dou Liyang <douly.fnst@xxxxxxxxxxxxxx>
AuthorDate: Mon, 6 Mar 2017 21:08:10 +0800
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
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 <douly.fnst@xxxxxxxxxxxxxx>
Cc: yinghai@xxxxxxxxxx
Link: http://lkml.kernel.org/r/1488805690-5055-1-git-send-email-douly.fnst@xxxxxxxxxxxxxx
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
---
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);