Skip to content

Commit 5b4d1db

Browse files
author
H. Peter Anvin
committed
x86, apic: Make disabled_cpu_apicid static read_mostly, fix typos
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>
1 parent 151e0c7 commit 5b4d1db

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

arch/x86/kernel/apic/apic.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ physid_mask_t phys_cpu_present_map;
7979
* disable_cpu_apicid=<int>, mostly used for the kdump 2nd kernel to
8080
* avoid undefined behaviour caused by sending INIT from AP to BSP.
8181
*/
82-
unsigned int disabled_cpu_apicid = BAD_APICID;
82+
static unsigned int disabled_cpu_apicid __read_mostly = BAD_APICID;
8383

8484
/*
8585
* Map cpu index to physical APIC ID
@@ -2124,7 +2124,7 @@ int generic_processor_info(int apicid, int version)
21242124
* boot_cpu_physical_apicid is designed to have the apicid
21252125
* returned by read_apic_id(), i.e, the apicid of the
21262126
* currently booting-up processor. However, on some platforms,
2127-
* it is temporarilly modified by the apicid reported as BSP
2127+
* it is temporarily modified by the apicid reported as BSP
21282128
* through MP table. Concretely:
21292129
*
21302130
* - arch/x86/kernel/mpparse.c: MP_processor_info()
@@ -2145,7 +2145,7 @@ int generic_processor_info(int apicid, int version)
21452145
disabled_cpu_apicid == apicid) {
21462146
int thiscpu = num_processors + disabled_cpus;
21472147

2148-
pr_warning("ACPI: Disabling requested cpu."
2148+
pr_warning("APIC: Disabling requested cpu."
21492149
" Processor %d/0x%x ignored.\n",
21502150
thiscpu, apicid);
21512151

0 commit comments

Comments
 (0)