tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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()

Linus Torvalds 6e8c78d3 9761070d

+7 -18
+1 -1
arch/x86/xen/pmu.c
··· 302 302 static bool pmu_msr_chk_emulated(unsigned int msr, uint64_t *val, bool is_read, 303 303 bool *emul) 304 304 { 305 - int type, index; 305 + int type, index = 0; 306 306 307 307 if (is_amd_pmu_msr(msr)) 308 308 *emul = xen_amd_pmu_emulate(msr, val, is_read);
+6 -17
arch/x86/xen/setup.c
··· 910 910 911 911 void xen_enable_sysenter(void) 912 912 { 913 - int ret; 914 - unsigned sysenter_feature; 915 - 916 - sysenter_feature = X86_FEATURE_SYSENTER32; 917 - 918 - if (!boot_cpu_has(sysenter_feature)) 919 - return; 920 - 921 - ret = register_callback(CALLBACKTYPE_sysenter, xen_entry_SYSENTER_compat); 922 - if(ret != 0) 923 - setup_clear_cpu_cap(sysenter_feature); 913 + if (cpu_feature_enabled(X86_FEATURE_SYSENTER32) && 914 + register_callback(CALLBACKTYPE_sysenter, xen_entry_SYSENTER_compat)) 915 + setup_clear_cpu_cap(X86_FEATURE_SYSENTER32); 924 916 } 925 917 926 918 void xen_enable_syscall(void) ··· 926 934 mechanism for syscalls. */ 927 935 } 928 936 929 - if (boot_cpu_has(X86_FEATURE_SYSCALL32)) { 930 - ret = register_callback(CALLBACKTYPE_syscall32, 931 - xen_entry_SYSCALL_compat); 932 - if (ret != 0) 933 - setup_clear_cpu_cap(X86_FEATURE_SYSCALL32); 934 - } 937 + if (cpu_feature_enabled(X86_FEATURE_SYSCALL32) && 938 + register_callback(CALLBACKTYPE_syscall32, xen_entry_SYSCALL_compat)) 939 + setup_clear_cpu_cap(X86_FEATURE_SYSCALL32); 935 940 } 936 941 937 942 static void __init xen_pvmmu_arch_setup(void)