Compare commits

...
4 Commits
Author SHA1 Message Date
Michal Kubecek 1678e8dfec 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:26:39 +02:00
Michal Kubecek c1ee74ac5e 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:26:39 +02:00
Michal Kubecek b7d3ea5042 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:26:27 +02:00
Michal Kubecek 15cfc0391c 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:24:53 +02:00
4 changed files with 28 additions and 0 deletions

No files matched your search

+11
View File
@@ -105,7 +105,11 @@ 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
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,
@@ -882,14 +886,21 @@ 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_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
int *type) //OUT: Fault type
#endif
{
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
struct vm_area_struct *vma = fault->vma;
#endif
VMLinux *vmLinux = (VMLinux *) vma->vm_file->private_data;
unsigned long pg;
struct page* page;
+5
View File
@@ -74,6 +74,11 @@
#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>
#endif
#include "vmware.h"
#include "x86apic.h"
+3
View File
@@ -36,6 +36,9 @@
#include <linux/slab.h>
#include <linux/version.h>
#include <linux/wait.h>
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
#include <linux/sched/signal.h>
#endif
#include <net/checksum.h>
#include <net/sock.h>
+9
View File
@@ -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