]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
x86, apic: Make disabled_cpu_apicid static read_mostly, fix typos
authorH. Peter Anvin <hpa@zytor.com>
Wed, 15 Jan 2014 21:02:08 +0000 (13:02 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Wed, 15 Jan 2014 21:02:08 +0000 (13:02 -0800)
Make disabled_cpu_apicid static and read_mostly, and fix a couple of
typos.

Reported-by: Ingo Molnar <mingo@kernel.org>
Link: http://lkml.kernel.org/r/20140115182511.GA22737@gmail.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Cc: HATAYAMA Daisuke <d.hatayama@jp.fujitsu.com>
arch/x86/kernel/apic/apic.c

index e78ab8c8ac2e5c1fc9d14bfde288e054847b3e9c..7f26c9a70a9e0ada12f46382d7ee2cd73b2d5f29 100644 (file)
@@ -79,7 +79,7 @@ physid_mask_t phys_cpu_present_map;
  * disable_cpu_apicid=<int>, mostly used for the kdump 2nd kernel to
  * avoid undefined behaviour caused by sending INIT from AP to BSP.
  */
-unsigned int disabled_cpu_apicid = BAD_APICID;
+static unsigned int disabled_cpu_apicid __read_mostly = BAD_APICID;
 
 /*
  * Map cpu index to physical APIC ID
@@ -2124,7 +2124,7 @@ int generic_processor_info(int apicid, int version)
         * boot_cpu_physical_apicid is designed to have the apicid
         * returned by read_apic_id(), i.e, the apicid of the
         * currently booting-up processor. However, on some platforms,
-        * it is temporarilly modified by the apicid reported as BSP
+        * it is temporarily modified by the apicid reported as BSP
         * through MP table. Concretely:
         *
         * - arch/x86/kernel/mpparse.c: MP_processor_info()
@@ -2145,7 +2145,7 @@ int generic_processor_info(int apicid, int version)
            disabled_cpu_apicid == apicid) {
                int thiscpu = num_processors + disabled_cpus;
 
-               pr_warning("ACPI: Disabling requested cpu."
+               pr_warning("APIC: Disabling requested cpu."
                           " Processor %d/0x%x ignored.\n",
                           thiscpu, apicid);