summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2023-03-24 19:44:43 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2023-03-24 19:44:43 +0300
commit2495697422d374b097151205d399ff0dcbaa08e0 (patch)
tree1ed45269f4c885b36e427ed64e0f0cb02f41dd80 /arch
parent4bae0ad148f41904dd4e5857bdc2e3e31b950b3d (diff)
parentaadbd07ff8a75ed342388846da78dfaddb8b106a (diff)
downloadlinux-2495697422d374b097151205d399ff0dcbaa08e0.tar.xz
Merge tag 'for-linus-6.3-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fixes from Juergen Gross: - fix build warning - avoid concurrent accesses to the Xen PV console ring page * tag 'for-linus-6.3-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: x86/PVH: avoid 32-bit build warning when obtaining VGA console info hvc/xen: prevent concurrent accesses to the shared ring
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/xen/enlighten_pvh.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/enlighten_pvh.c b/arch/x86/xen/enlighten_pvh.c
index 1da44aca896c..ada3868c02c2 100644
--- a/arch/x86/xen/enlighten_pvh.c
+++ b/arch/x86/xen/enlighten_pvh.c
@@ -48,7 +48,7 @@ void __init xen_pvh_init(struct boot_params *boot_params)
struct xen_platform_op op = {
.cmd = XENPF_get_dom0_console,
};
- long ret = HYPERVISOR_platform_op(&op);
+ int ret = HYPERVISOR_platform_op(&op);
if (ret > 0)
xen_init_vga(&op.u.dom0_console,