From: Oliver Kurth Date: Fri, 15 Sep 2017 18:23:09 +0000 (-0700) Subject: Hgfs Linux Kernel Client: Fix RHEL 7 system backports X-Git-Tag: stable-10.2.0~478 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1cd45f716b974925a12e7c59f89eb5bf6731d20;p=thirdparty%2Fopen-vm-tools.git Hgfs Linux Kernel Client: Fix RHEL 7 system backports RHEL 7.3 introduced some backport changes for the Linux kernel which broke some of the assumptions about wait_on_bit function arguments. This fixes the test of wait_on_bit compile which accidentally tests the function in kernel 3.17.0 which will always fail instead of intentionally failing with the pragma. --- diff --git a/open-vm-tools/modules/linux/shared/autoconf/wait_on_bit.c b/open-vm-tools/modules/linux/shared/autoconf/wait_on_bit.c index 31664a91e..a543cc13e 100644 --- a/open-vm-tools/modules/linux/shared/autoconf/wait_on_bit.c +++ b/open-vm-tools/modules/linux/shared/autoconf/wait_on_bit.c @@ -19,7 +19,7 @@ #include "compat_version.h" #include "compat_autoconf.h" -#if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 17, 0) && \ +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) && \ LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) #include