Messages in this thread Patch in this message | | | From | Dou Liyang <> | Subject | [PATCH] x86/acpi: Fix a warning message in logical CPU IDs allocation | Date | Tue, 28 Feb 2017 13:50:52 +0800 |
| |
Current warning message regarded the "nr_cpu_ids - 1" as the limit number of the CPUs. It may be confused us, for example: we have two CPUs, nr_cpu_ids = 2, but the warning message may indicate that we just have 1 CPU, which likes that: Only 1 processors supported.Processor 2/0x2 and the rest are ignored.
Fix the warning message, replace "nr_cpu_ids - 1" with "nr_cpu_ids". And the warning message can be like that: APIC: NR_CPUS/possible_cpus limit of 2 reached. Processor 2/0x2 and the rest are ignored.
Signed-off-by: Dou Liyang <douly.fnst@cn.fujitsu.com> --- arch/x86/kernel/apic/apic.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index 8567c85..fcdd15e 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -2062,10 +2062,10 @@ static int allocate_logical_cpuid(int apicid) /* Allocate a new cpuid. */ if (nr_logical_cpuids >= nr_cpu_ids) { - WARN_ONCE(1, "Only %d processors supported." + WARN_ONCE(1, "APIC: NR_CPUS/possible_cpus limit of %i reached. " "Processor %d/0x%x and the rest are ignored.\n", - nr_cpu_ids - 1, nr_logical_cpuids, apicid); - return -1; + nr_cpu_ids, nr_logical_cpuids, apicid); + return -EINVAL; } cpuid_to_apicid[nr_logical_cpuids] = apicid; -- 2.5.5
| |