Merge tag 'for-linus-4.8-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mirror_ubuntu-artful-kernel.git] / arch / x86 / kernel / apic / apic.c

diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index db2326fd6cfa3cc1deaba34b250f4dbd3d516eea..ac8d8ad8b0091507e2ad4dedf1475d3e42d3716e 100644 (file)
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -2047,7 +2047,7 @@ int generic_processor_info(int apicid, int version)
                int thiscpu = max + disabled_cpus - 1;
 
                pr_warning(
-                       "ACPI: NR_CPUS/possible_cpus limit of %i almost"
+                       "APIC: NR_CPUS/possible_cpus limit of %i almost"
                        " reached. Keeping one slot for boot cpu."
                        "  Processor %d/0x%x ignored.\n", max, thiscpu, apicid);
 
@@ -2059,7 +2059,7 @@ int generic_processor_info(int apicid, int version)
                int thiscpu = max + disabled_cpus;
 
                pr_warning(
-                       "ACPI: NR_CPUS/possible_cpus limit of %i reached."
+                       "APIC: NR_CPUS/possible_cpus limit of %i reached."
                        "  Processor %d/0x%x ignored.\n", max, thiscpu, apicid);
 
                disabled_cpus++;
@@ -2087,7 +2087,7 @@ int generic_processor_info(int apicid, int version)
        if (topology_update_package_map(apicid, cpu) < 0) {
                int thiscpu = max + disabled_cpus;
 
-               pr_warning("ACPI: Package limit reached. Processor %d/0x%x ignored.\n",
+               pr_warning("APIC: Package limit reached. Processor %d/0x%x ignored.\n",
                           thiscpu, apicid);
                disabled_cpus++;
                return -ENOSPC;