Commit 8e6b65a1 authored by zhong jiang's avatar zhong jiang Committed by Borislav Petkov
Browse files

x86/CPU: Fix unused variable warning when !CONFIG_IA32_EMULATION 



Get rid of local @cpu variable which is unused in the
!CONFIG_IA32_EMULATION case.

Signed-off-by: default avatarzhong jiang <zhongjiang@huawei.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: David Woodhouse <dwmw@amazon.co.uk>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Pavel Tatashin <pasha.tatashin@oracle.com>
Cc: x86-ml <x86@kernel.org>
Link: http://lkml.kernel.org/r/1536806985-24197-1-git-send-email-zhongjiang@huawei.com


[ Clean up commit message. ]
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
parent bf904d27

arch/x86/kernel/cpu/common.c

+2 −3
Original line number Diff line number Diff line
@@ -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);