|
@@ -1531,8 +1531,6 @@ EXPORT_PER_CPU_SYMBOL(__preempt_count);
|
|
|
/* May not be marked __init: used by software suspend */
|
|
|
void syscall_init(void)
|
|
|
{
|
|
|
- int __maybe_unused cpu = smp_processor_id();
|
|
|
-
|
|
|
wrmsr(MSR_STAR, 0, (__USER32_CS << 16) | __KERNEL_CS);
|
|
|
wrmsrl(MSR_LSTAR, (unsigned long)entry_SYSCALL_64);
|
|
|
|
|
@@ -1545,7 +1543,8 @@ void syscall_init(void)
|
|
|
* AMD doesn't allow SYSENTER in long mode (either 32- or 64-bit).
|
|
|
*/
|
|
|
wrmsrl_safe(MSR_IA32_SYSENTER_CS, (u64)__KERNEL_CS);
|
|
|
- wrmsrl_safe(MSR_IA32_SYSENTER_ESP, (unsigned long)(cpu_entry_stack(cpu) + 1));
|
|
|
+ wrmsrl_safe(MSR_IA32_SYSENTER_ESP,
|
|
|
+ (unsigned long)(cpu_entry_stack(smp_processor_id()) + 1));
|
|
|
wrmsrl_safe(MSR_IA32_SYSENTER_EIP, (u64)entry_SYSENTER_compat);
|
|
|
#else
|
|
|
wrmsrl(MSR_CSTAR, (unsigned long)ignore_sysret);
|