all: replace get_user_pages() write/force parameters with flags

Since commit 3b913179c3fa ("mm: replace get_user_pages_locked() write/force parameters with gup_flags") in v4.9-rc2, get_user_pages() has one flags argument rather than separate write and force flags.
vmnet: use standard definition of PCI_VENDOR_ID_VMWARE if available
2017-05-31 09:21:31 +02:00 · 2017-05-31 09:21:31 +02:00
1 changed files with 5 additions and 0 deletions
@@ -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