aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDou Liyang <douly.fnst@cn.fujitsu.com>2017-01-05 04:54:43 -0500
committerIngo Molnar <mingo@kernel.org>2017-01-06 02:40:33 -0500
commit12bf98b91f7aa8a9a526309aba645ccdcc470cab (patch)
tree8d510425fd8598f905f19579fbc066221d38b492
parent88ba6cae15e38f609aba4f3881e1c404c432596c (diff)
x86/apic: Fix typos in comments
s/ID/IDs/ s/inr_logical_cpuidi/nr_logical_cpuids/ s/generic_processor_info()/__generic_processor_info()/ Signed-off-by: Dou Liyang <douly.fnst@cn.fujitsu.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/1483610083-24314-1-git-send-email-douly.fnst@cn.fujitsu.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--arch/x86/kernel/apic/apic.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 5b7e43eff139..5c4fdcfda109 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -2028,8 +2028,8 @@ void disconnect_bsp_APIC(int virt_wire_setup)
2028/* 2028/*
2029 * The number of allocated logical CPU IDs. Since logical CPU IDs are allocated 2029 * The number of allocated logical CPU IDs. Since logical CPU IDs are allocated
2030 * contiguously, it equals to current allocated max logical CPU ID plus 1. 2030 * contiguously, it equals to current allocated max logical CPU ID plus 1.
2031 * All allocated CPU ID should be in [0, nr_logical_cpuidi), so the maximum of 2031 * All allocated CPU IDs should be in the [0, nr_logical_cpuids) range,
2032 * nr_logical_cpuids is nr_cpu_ids. 2032 * so the maximum of nr_logical_cpuids is nr_cpu_ids.
2033 * 2033 *
2034 * NOTE: Reserve 0 for BSP. 2034 * NOTE: Reserve 0 for BSP.
2035 */ 2035 */
@@ -2094,7 +2094,7 @@ int __generic_processor_info(int apicid, int version, bool enabled)
2094 * Since fixing handling of boot_cpu_physical_apicid requires 2094 * Since fixing handling of boot_cpu_physical_apicid requires
2095 * another discussion and tests on each platform, we leave it 2095 * another discussion and tests on each platform, we leave it
2096 * for now and here we use read_apic_id() directly in this 2096 * for now and here we use read_apic_id() directly in this
2097 * function, generic_processor_info(). 2097 * function, __generic_processor_info().
2098 */ 2098 */
2099 if (disabled_cpu_apicid != BAD_APICID && 2099 if (disabled_cpu_apicid != BAD_APICID &&
2100 disabled_cpu_apicid != read_apic_id() && 2100 disabled_cpu_apicid != read_apic_id() &&