diff options
| author | Jean-Marc Lenoir | 2022-11-19 18:52:56 +0100 |
|---|---|---|
| committer | Jean-Marc Lenoir | 2022-11-19 18:52:56 +0100 |
| commit | 34bac73728073542c1178731f7e7e6b5bc9b6bef (patch) | |
| tree | ec9aa610ddeb7c1a43a6c229a87f81207859394d /vmmon.patch | |
| parent | 072b4ea4c99c0b4ae87961ac9316b2a7e439d84c (diff) | |
| download | aur-34bac73728073542c1178731f7e7e6b5bc9b6bef.tar.gz | |
Sync with vmware-workstation 17.0.0
Diffstat (limited to 'vmmon.patch')
| -rw-r--r-- | vmmon.patch | 36 |
1 files changed, 6 insertions, 30 deletions
diff --git a/vmmon.patch b/vmmon.patch index 13fba9829e7a..08806a4eec67 100644 --- a/vmmon.patch +++ b/vmmon.patch @@ -1462,7 +1462,7 @@ ret = vPgAddr | (((VA)p) & (PAGE_SIZE - 1)); -@@ -2273,16 +2372,22 @@ HostIF_VMLockIsHeld(VMDriver *vm) // IN +@@ -2273,16 +2372,26 @@ HostIF_VMLockIsHeld(VMDriver *vm) // IN static Bool isVAReadable(VA r) // IN: { @@ -1470,7 +1470,11 @@ uint32 dummy; int ret; -+#ifdef HAVE_GET_KERNEL_NOFAULT ++#if defined(HAVE_GET_KERNEL_NOFAULT) || LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0) ++ /* ++ * Exists from 5.10, first indicated by HAVE_GET_KERNEL_NOFAULT, ++ * and from post-5.17 just existing everywhere. ++ */ + ret = get_kernel_nofault(dummy, (void *)r); +#else + { @@ -1859,31 +1863,3 @@ break; } -From 16d490ae022d7fc4ca867971e20e2dcd59e6ca5a Mon Sep 17 00:00:00 2001 -From: Michal Kubecek <mkubecek@suse.cz> -Date: Mon, 4 Apr 2022 01:57:28 +0200 -Subject: [PATCH] vmmon: do not rely on HAVE_GET_KERNEL_NOFAULT - -Mainline commit 34737e269803 ("uaccess: add generic -__{get,put}_kernel_nofault") in 5.18-rc1 removes HAVE_GET_KERNEL_NOFAULT -macro as all architectures can use get_kernel_nofault() now. Check for -existence of __get_kernel_nofault() instead and add also a version check in -case it stops being a macro or is removed in the future. ---- - vmmon-only/linux/hostif.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c -index a21c300..b6326e9 100644 ---- a/vmmon-only/linux/hostif.c -+++ b/vmmon-only/linux/hostif.c -@@ -2382,7 +2382,8 @@ isVAReadable(VA r) // IN: - uint32 dummy; - int ret; - --#ifdef HAVE_GET_KERNEL_NOFAULT -+#if defined(HAVE_GET_KERNEL_NOFAULT) || defined(__get_kernel_nofault) || \ -+ (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)) - ret = get_kernel_nofault(dummy, (void *)r); - #else - { |