Commit 6e8c78d3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-6.1-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip 

Pull xen fixes from Juergen Gross:
 "One fix for silencing a smatch warning, and a small cleanup patch"

* tag 'for-linus-6.1-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  x86/xen: simplify sysenter and syscall setup
  x86/xen: silence smatch warning in pmu_msr_chk_emulated()
parents 9761070d 4bff677b

arch/x86/xen/pmu.c

+1 −1
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ static bool xen_amd_pmu_emulate(unsigned int msr, u64 *val, bool is_read) 
static bool pmu_msr_chk_emulated(unsigned int msr, uint64_t *val, bool is_read,

				 bool *emul)

{

	int type, index;

	int type, index = 0;



	if (is_amd_pmu_msr(msr))

		*emul = xen_amd_pmu_emulate(msr, val, is_read);

arch/x86/xen/setup.c

+6 −17
Original line number Diff line number Diff line
@@ -910,17 +910,9 @@ static int register_callback(unsigned type, const void *func) 


void xen_enable_sysenter(void)

{

	int ret;

	unsigned sysenter_feature;



	sysenter_feature = X86_FEATURE_SYSENTER32;



	if (!boot_cpu_has(sysenter_feature))

		return;



	ret = register_callback(CALLBACKTYPE_sysenter, xen_entry_SYSENTER_compat);

	if(ret != 0)

		setup_clear_cpu_cap(sysenter_feature);

	if (cpu_feature_enabled(X86_FEATURE_SYSENTER32) &&

	    register_callback(CALLBACKTYPE_sysenter, xen_entry_SYSENTER_compat))

		setup_clear_cpu_cap(X86_FEATURE_SYSENTER32);

}



void xen_enable_syscall(void)
@@ -934,13 +926,10 @@ void xen_enable_syscall(void) 
		   mechanism for syscalls. */

	}



	if (boot_cpu_has(X86_FEATURE_SYSCALL32)) {

		ret = register_callback(CALLBACKTYPE_syscall32,

					xen_entry_SYSCALL_compat);

		if (ret != 0)

	if (cpu_feature_enabled(X86_FEATURE_SYSCALL32) &&

	    register_callback(CALLBACKTYPE_syscall32, xen_entry_SYSCALL_compat))

		setup_clear_cpu_cap(X86_FEATURE_SYSCALL32);

}

}



static void __init xen_pvmmu_arch_setup(void)

{