diff options
| -rw-r--r-- | arch/x86/kernel/apic/apic.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index e78ab8c8ac2e..7f26c9a70a9e 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c | |||
| @@ -79,7 +79,7 @@ physid_mask_t phys_cpu_present_map; | |||
| 79 | * disable_cpu_apicid=<int>, mostly used for the kdump 2nd kernel to | 79 | * disable_cpu_apicid=<int>, mostly used for the kdump 2nd kernel to |
| 80 | * avoid undefined behaviour caused by sending INIT from AP to BSP. | 80 | * avoid undefined behaviour caused by sending INIT from AP to BSP. |
| 81 | */ | 81 | */ |
| 82 | unsigned int disabled_cpu_apicid = BAD_APICID; | 82 | static unsigned int disabled_cpu_apicid __read_mostly = BAD_APICID; |
| 83 | 83 | ||
| 84 | /* | 84 | /* |
| 85 | * Map cpu index to physical APIC ID | 85 | * Map cpu index to physical APIC ID |
| @@ -2124,7 +2124,7 @@ int generic_processor_info(int apicid, int version) | |||
| 2124 | * boot_cpu_physical_apicid is designed to have the apicid | 2124 | * boot_cpu_physical_apicid is designed to have the apicid |
| 2125 | * returned by read_apic_id(), i.e, the apicid of the | 2125 | * returned by read_apic_id(), i.e, the apicid of the |
| 2126 | * currently booting-up processor. However, on some platforms, | 2126 | * 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 |
| 2128 | * through MP table. Concretely: | 2128 | * through MP table. Concretely: |
| 2129 | * | 2129 | * |
| 2130 | * - arch/x86/kernel/mpparse.c: MP_processor_info() | 2130 | * - arch/x86/kernel/mpparse.c: MP_processor_info() |
| @@ -2145,7 +2145,7 @@ int generic_processor_info(int apicid, int version) | |||
| 2145 | disabled_cpu_apicid == apicid) { | 2145 | disabled_cpu_apicid == apicid) { |
| 2146 | int thiscpu = num_processors + disabled_cpus; | 2146 | int thiscpu = num_processors + disabled_cpus; |
| 2147 | 2147 | ||
| 2148 | pr_warning("ACPI: Disabling requested cpu." | 2148 | pr_warning("APIC: Disabling requested cpu." |
| 2149 | " Processor %d/0x%x ignored.\n", | 2149 | " Processor %d/0x%x ignored.\n", |
| 2150 | thiscpu, apicid); | 2150 | thiscpu, apicid); |
| 2151 | 2151 | ||
