diff options
Diffstat (limited to 'arch/x86/kernel/smpboot_64.c')
-rw-r--r-- | arch/x86/kernel/smpboot_64.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/kernel/smpboot_64.c b/arch/x86/kernel/smpboot_64.c index 0faa0a0af272..e351ac4ab5b1 100644 --- a/arch/x86/kernel/smpboot_64.c +++ b/arch/x86/kernel/smpboot_64.c | |||
@@ -102,8 +102,8 @@ EXPORT_PER_CPU_SYMBOL(cpu_core_map); | |||
102 | * Trampoline 80x86 program as an array. | 102 | * Trampoline 80x86 program as an array. |
103 | */ | 103 | */ |
104 | 104 | ||
105 | extern unsigned char trampoline_data[]; | 105 | extern const unsigned char trampoline_data[]; |
106 | extern unsigned char trampoline_end[]; | 106 | extern const unsigned char trampoline_end[]; |
107 | 107 | ||
108 | /* State of each CPU */ | 108 | /* State of each CPU */ |
109 | DEFINE_PER_CPU(int, cpu_state) = { 0 }; | 109 | DEFINE_PER_CPU(int, cpu_state) = { 0 }; |
@@ -695,7 +695,6 @@ do_rest: | |||
695 | cpu_clear(cpu, cpu_present_map); | 695 | cpu_clear(cpu, cpu_present_map); |
696 | cpu_clear(cpu, cpu_possible_map); | 696 | cpu_clear(cpu, cpu_possible_map); |
697 | x86_cpu_to_apicid[cpu] = BAD_APICID; | 697 | x86_cpu_to_apicid[cpu] = BAD_APICID; |
698 | x86_cpu_to_log_apicid[cpu] = BAD_APICID; | ||
699 | return -EIO; | 698 | return -EIO; |
700 | } | 699 | } |
701 | 700 | ||