Merge branch 'master' into player-12.5.6

mark branch player-12.5.6 as retired
vmmon: adapt to 5-level page table hierarchy
2018-04-02 15:37:21 +02:00 · 2018-04-02 15:33:40 +02:00 · 2017-05-31 10:09:52 +02:00 · 2017-05-31 10:09:26 +02:00 · 2017-05-31 10:08:04 +02:00 · 2017-05-31 10:07:26 +02:00
5 changed files with 12 additions and 13 deletions
@@ -1,5 +1,5 @@
 *-----------------------------------------------------------------------------
-* Branch workstation-12.5.5 has been retired on 2017-05-31 and has not been
+* Branch player-12.5.6 has been retired on 2017-05-31 and has not been
 * receiving any updates since. Please switch to latest 12.5.x version
 * available.
 *
@@ -24,7 +24,11 @@
 * Include linux/cred.h via linux/sched.h - it is not nice, but
 * as cpp does not have #ifexist...
 */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
 #include <linux/sched.h>
+#else
+#include <linux/cred.h>
+#endif

 #if !defined(current_fsuid) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
 #define current_uid() (current->uid)
@@ -104,12 +104,10 @@ long LinuxDriver_Ioctl(struct file *filp, u_int iocmd,

 static int LinuxDriver_Close(struct inode *inode, struct file *filp);
 static unsigned int LinuxDriverPoll(struct file *file, poll_table *wait);
-#if defined(VMW_NOPAGE_2624)
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
 static int LinuxDriverFault(struct vm_fault *fault);
-#else
+#elif defined(VMW_NOPAGE_2624)
 static int LinuxDriverFault(struct vm_area_struct *vma, struct vm_fault *fault);
-#endif
 #else
 static struct page *LinuxDriverNoPage(struct vm_area_struct *vma,
                                      unsigned long address,
@@ -885,13 +883,12 @@ LinuxDriverPollTimeout(unsigned long clientData)  // IN:
 *-----------------------------------------------------------------------------
 */

-#if defined(VMW_NOPAGE_2624)
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
-static int LinuxDriverFault(struct vm_fault *fault)     //IN/OUT
-#else
+static int
+LinuxDriverFault(struct vm_fault *fault)     //IN/OUT
+#elif defined(VMW_NOPAGE_2624)
 static int LinuxDriverFault(struct vm_area_struct *vma, //IN
                            struct vm_fault *fault)     //IN/OUT
-#endif
 #else
 static struct page *LinuxDriverNoPage(struct vm_area_struct *vma, //IN
                                      unsigned long address,      //IN
@@ -73,13 +73,11 @@
 #include <linux/capability.h>
 #include <linux/kthread.h>
 #include <linux/wait.h>
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
 #include <linux/signal.h>
-#include <linux/sched/signal.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+#include <linux/taskstats_kern.h> // For linux/sched/signal.h without version check
 #endif

-
 #include "vmware.h"
 #include "x86apic.h"
 #include "vm_asm.h"
@@ -37,7 +37,7 @@
 #include <linux/version.h>
 #include <linux/wait.h>
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
-#include <linux/sched/signal.h>
+#include <linux/taskstats_kern.h>  // For <linux/sched/signal.h> without version dependency
 #endif

 #include <net/checksum.h>
Author	SHA1	Message	Date
Michal Kubecek	e48dcf8412	Merge branch 'master' into player-12.5.6	2018-04-02 15:37:21 +02:00
Michal Kubecek	2a57f2834c	mark branch player-12.5.6 as retired	2018-04-02 15:33:40 +02:00
Michal Kubecek	51cf4e9846	vmmon: adapt to 5-level page table hierarchy Since commit f2a6a7050109 ("x86: Convert the rest of the code to support p4d_t") in v4.12-rc1 we need to handle the 5-level page table hierarchy (pgd -> p4d -> pud -> pmd -> pte).	2017-05-31 10:09:52 +02:00
Michal Kubecek	d9457a4fab	vmmon: use standard definition of MSR_MISC_FEATURES_ENABLES if available The MSR_MISC_FEATURES_ENABLES macro is defined in mainline since commit ab6d9468631a ("x86/msr: Rename MISC_FEATURE_ENABLES to MISC_FEATURES_ENABLES") in v4.12-rc1. The MSR_MISC_FEATURES_ENABLES_CPUID_FAULT macro is defined in mainline since commit e9ea1e7f53b8 ("x86/arch_prctl: Add ARCH_[GET\|SET]_CPUID") in v4.12-rc1.	2017-05-31 10:09:26 +02:00
Michal Kubecek	989a328fa5	vmnet: use standard definition of PCI_VENDOR_ID_VMWARE_VMXNET3 if available The PCI_DEVICE_ID_VMWARE_VMXNET3 macro is defined in mainline pci_ids.h since commit b1226c7db1d9 ("vmxnet3: Move PCI Id to pci_ids.h") in v4.10-rc1.	2017-05-31 10:08:04 +02:00
Michal Kubecek	a116d32e0a	vmnet: use standard definition of PCI_VENDOR_ID_VMWARE if available The PCI_VENDOR_ID_VMWARE macro is defined in mainline pci_ids.h since commit 94e57fea6202 ("PCI: Move PCI_VENDOR_ID_VMWARE to pci_ids.h") in v3.18-rc1.	2017-05-31 10:07:26 +02:00
Michal Kubecek	0e634ffbf1	import Player 12.5.6 module sources	2017-05-31 10:06:51 +02:00
Michal Kubecek	c62c78e908	import Player 12.5.5 module sources	2017-05-31 09:20:00 +02:00
Michal Kubecek	4f648692e4	import Player 12.5.2 module sources	2017-05-31 09:19:26 +02:00