Commit 9f808288 authored by Martin Krastev's avatar Martin Krastev Committed by Zack Rusin

drm/vmwgfx: Fix build issues in mksGuestStats discovered by the kernel test robot

Fixes for ARCH
i386
	* printk format specifier warnings
	* inconsistent operand constraints in an ‘asm’ errors
arm64
	* not targeted by the commit being fixed
Reviewed-by: default avatarZack Rusin <zackr@vmware.com>
Fixes: 7a7a933e ("drm/vmwgfx: Introduce VMware mks-guest-stats")
Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarMartin Krastev <krastevm@vmware.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210615182336.995192-5-zackr@vmware.comSigned-off-by: default avatarZack Rusin <zackr@vmware.com>
parent 46e4e5ff
...@@ -25,6 +25,7 @@ config DRM_VMWGFX_FBCON ...@@ -25,6 +25,7 @@ config DRM_VMWGFX_FBCON
config DRM_VMWGFX_MKSSTATS config DRM_VMWGFX_MKSSTATS
bool "Enable mksGuestStats instrumentation of vmwgfx by default" bool "Enable mksGuestStats instrumentation of vmwgfx by default"
depends on DRM_VMWGFX depends on DRM_VMWGFX
depends on X86
default n default n
help help
Choose this option to instrument the kernel driver for mksGuestStats. Choose this option to instrument the kernel driver for mksGuestStats.
......
...@@ -665,7 +665,7 @@ static inline void hypervisor_ppn_add(PPN64 pfn) ...@@ -665,7 +665,7 @@ static inline void hypervisor_ppn_add(PPN64 pfn)
unsigned long eax, ebx, ecx, edx, si = 0, di = 0; unsigned long eax, ebx, ecx, edx, si = 0, di = 0;
VMW_PORT(VMW_PORT_CMD_MKSGS_ADD_PPN, VMW_PORT(VMW_PORT_CMD_MKSGS_ADD_PPN,
pfn, si, di, (unsigned long)pfn, si, di,
0, 0,
VMW_HYPERVISOR_MAGIC, VMW_HYPERVISOR_MAGIC,
eax, ebx, ecx, edx, si, di); eax, ebx, ecx, edx, si, di);
...@@ -682,7 +682,7 @@ static inline void hypervisor_ppn_remove(PPN64 pfn) ...@@ -682,7 +682,7 @@ static inline void hypervisor_ppn_remove(PPN64 pfn)
unsigned long eax, ebx, ecx, edx, si = 0, di = 0; unsigned long eax, ebx, ecx, edx, si = 0, di = 0;
VMW_PORT(VMW_PORT_CMD_MKSGS_REMOVE_PPN, VMW_PORT(VMW_PORT_CMD_MKSGS_REMOVE_PPN,
pfn, si, di, (unsigned long)pfn, si, di,
0, 0,
VMW_HYPERVISOR_MAGIC, VMW_HYPERVISOR_MAGIC,
eax, ebx, ecx, edx, si, di); eax, ebx, ecx, edx, si, di);
...@@ -1115,7 +1115,7 @@ int vmw_mksstat_add_ioctl(struct drm_device *dev, void *data, ...@@ -1115,7 +1115,7 @@ int vmw_mksstat_add_ioctl(struct drm_device *dev, void *data,
arg->id = slot; arg->id = slot;
DRM_DEV_INFO(dev->dev, "pid=%d arg.description='%.*s' id=%lu\n", current->pid, (int)desc_len, pdesc->description, slot); DRM_DEV_INFO(dev->dev, "pid=%d arg.description='%.*s' id=%zu\n", current->pid, (int)desc_len, pdesc->description, slot);
return 0; return 0;
...@@ -1163,7 +1163,7 @@ int vmw_mksstat_remove_ioctl(struct drm_device *dev, void *data, ...@@ -1163,7 +1163,7 @@ int vmw_mksstat_remove_ioctl(struct drm_device *dev, void *data,
if (slot >= ARRAY_SIZE(dev_priv->mksstat_user_pids)) if (slot >= ARRAY_SIZE(dev_priv->mksstat_user_pids))
return -EINVAL; return -EINVAL;
DRM_DEV_INFO(dev->dev, "pid=%d arg.id=%lu\n", current->pid, slot); DRM_DEV_INFO(dev->dev, "pid=%d arg.id=%zu\n", current->pid, slot);
pgid = task_pgrp_vnr(current); pgid = task_pgrp_vnr(current);
pid = atomic_cmpxchg(&dev_priv->mksstat_user_pids[slot], pgid, MKSSTAT_PID_RESERVED); pid = atomic_cmpxchg(&dev_priv->mksstat_user_pids[slot], pgid, MKSSTAT_PID_RESERVED);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment