Commit b9e6612d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_urgent_for_v6.10_rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 fixes from Borislav Petkov:

 - An ARM-relevant fix to not free default RMIDs of a resource control
   group

 - A randconfig build fix for the VMware virtual GPU driver

* tag 'x86_urgent_for_v6.10_rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/resctrl: Don't try to free nonexistent RMIDs
  drm/vmwgfx: Fix missing HYPERVISOR_GUEST dependency
parents d1505b5c 739c9765

arch/x86/kernel/cpu/resctrl/monitor.c

+2 −1
Original line number Diff line number Diff line
@@ -519,7 +519,8 @@ void free_rmid(u32 closid, u32 rmid) 
	 * allows architectures that ignore the closid parameter to avoid an

	 * unnecessary check.

	 */

	if (idx == resctrl_arch_rmid_idx_encode(RESCTRL_RESERVED_CLOSID,

	if (!resctrl_arch_mon_capable() ||

	    idx == resctrl_arch_rmid_idx_encode(RESCTRL_RESERVED_CLOSID,

						RESCTRL_RESERVED_RMID))

		return;

drivers/gpu/drm/vmwgfx/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
config DRM_VMWGFX

	tristate "DRM driver for VMware Virtual GPU"

	depends on DRM && PCI && MMU

	depends on X86 || ARM64

	depends on (X86 && HYPERVISOR_GUEST) || ARM64

	select DRM_TTM

	select DRM_TTM_HELPER

	select MAPPING_DIRTY_HELPERS