all: add explicit includes for signal headers

Since commit c3edc4010e9d ("sched/headers: Move task_struct::signal and task_struct::sighand types and accessors into <linux/sched/signal.h>") in v4.11-rc1, force_sig() and signal_pending() are in <linux/sched/signal.h> Since commit 192c9414516e ("sched/headers: Remove <linux/signal.h> from <linux/sched.h>") in v4.11-rc1, <linux/signal.h> needs to be included explicitely, it's no longer included via <linux/sched.h>
vmmon: drop vma parameter of vm_operations_struct::fault
2017-05-31 09:37:01 +02:00 · 2017-05-31 09:37:01 +02:00 · 2017-05-31 09:37:01 +02:00 · 2017-05-31 09:37:01 +02:00
5 changed files with 21 additions and 11 deletions
@@ -24,11 +24,7 @@
 * 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,10 +104,12 @@ 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);
-#elif defined(VMW_NOPAGE_2624)
+#else
 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,
@@ -883,12 +885,13 @@ 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
-#elif defined(VMW_NOPAGE_2624)
+static int LinuxDriverFault(struct vm_fault *fault)     //IN/OUT
+#else
 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,11 +73,13 @@
 #include <linux/capability.h>
 #include <linux/kthread.h>
 #include <linux/wait.h>
-#include <linux/signal.h>
+
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
-#include <linux/taskstats_kern.h> // For linux/sched/signal.h without version check
+#include <linux/signal.h>
+#include <linux/sched/signal.h>
 #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/taskstats_kern.h>  // For <linux/sched/signal.h> without version dependency
+#include <linux/sched/signal.h>
 #endif

 #include <net/checksum.h>
@@ -35,6 +35,8 @@
 #endif
 #endif

+#include <linux/pci_ids.h>
+
 /* LSILogic 53C1030 Parallel SCSI controller
 * LSILogic SAS1068 SAS controller
 */
@@ -53,7 +55,10 @@
 *    VMware HD Audio codec
 *    VMware HD Audio controller
 */
+#ifndef PCI_VENDOR_ID_VMWARE
 #define PCI_VENDOR_ID_VMWARE                    0x15AD
+#endif
+
 #define PCI_DEVICE_ID_VMWARE_SVGA2              0x0405
 #define PCI_DEVICE_ID_VMWARE_SVGA               0x0710
 #define PCI_DEVICE_ID_VMWARE_VGA                0x0711
@@ -70,7 +75,11 @@
 #define PCI_DEVICE_ID_VMWARE_1394               0x0780
 #define PCI_DEVICE_ID_VMWARE_BRIDGE             0x0790
 #define PCI_DEVICE_ID_VMWARE_ROOTPORT           0x07A0
+
+#ifndef PCI_DEVICE_ID_VMWARE_VMXNET3
 #define PCI_DEVICE_ID_VMWARE_VMXNET3            0x07B0
+#endif
+
 #define PCI_DEVICE_ID_VMWARE_PVSCSI             0x07C0
 #define PCI_DEVICE_ID_VMWARE_82574              0x07D0
 #define PCI_DEVICE_ID_VMWARE_AHCI               0x07E0
Author	SHA1	Message	Date
Michal Kubecek	a276e824f6	all: add explicit includes for signal headers Since commit c3edc4010e9d ("sched/headers: Move task_struct::signal and task_struct::sighand types and accessors into <linux/sched/signal.h>") in v4.11-rc1, force_sig() and signal_pending() are in <linux/sched/signal.h> Since commit 192c9414516e ("sched/headers: Remove <linux/signal.h> from <linux/sched.h>") in v4.11-rc1, <linux/signal.h> needs to be included explicitely, it's no longer included via <linux/sched.h>	2017-05-31 09:37:01 +02:00
Michal Kubecek	09ad2d7715	vmmon: drop vma parameter of vm_operations_struct::fault Since commit 11bac8000449 ("mm, fs: reduce fault, page_mkwrite, and pfn_mkwrite to take only vmf") in v4.11-rc1, fault() callback in struct vm_operations_struct takes only one argument.	2017-05-31 09:37:01 +02:00
Michal Kubecek	040a03feb3	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 09:37:01 +02:00
Michal Kubecek	f11a14be6c	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 09:37:01 +02:00