This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/kernel/common/inc/nv-lock.h b/kernel/common/inc/nv-lock.h | |
index f2ef557..2880faf 100644 | |
--- a/kernel/common/inc/nv-lock.h | |
+++ b/kernel/common/inc/nv-lock.h | |
@@ -13,7 +13,11 @@ | |
#include "conftest.h" | |
+#include <linux/version.h> | |
#include <linux/spinlock.h> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/work/vboxnetflt/linux/VBoxNetFlt-linux.c b/work/vboxnetflt/linux/VBoxNetFlt-linux.c | |
index f824654..b61d82c 100644 | |
--- work/vboxnetflt/linux/VBoxNetFlt-linux.c | |
+++ work/vboxnetflt/linux/VBoxNetFlt-linux.c | |
@@ -126,6 +126,10 @@ typedef struct VBOXNETFLTNOTIFIER *PVBOXNETFLTNOTIFIER; | |
# endif | |
#endif | |
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0) | |
+#define SKB_GSO_UDP 0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/work/vboxdrv/r0drv/linux/timer-r0drv-linux.c b/work/vboxdrv/r0drv/linux/timer-r0drv-linux.c | |
index 2bb2bfb..3b4a508 100644 | |
--- work/vboxdrv/r0drv/linux/timer-r0drv-linux.c | |
+++ work/vboxdrv/r0drv/linux/timer-r0drv-linux.c | |
@@ -720,9 +720,9 @@ static enum hrtimer_restart rtTimerLinuxHrCallback(struct hrtimer *pHrTimer) | |
* | |
* @param ulUser Address of the sub-timer structure. | |
*/ | |
-static void rtTimerLinuxStdCallback(unsigned long ulUser) | |
+static void rtTimerLinuxStdCallback(struct timer_list *t) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git work/vboxdrv/r0drv/linux/memobj-r0drv-linux.c b/work/vboxdrv/r0drv/linux/memobj-r0drv-linux.c | |
index c9feddf..1acf6de 100644 | |
--- work/vboxdrv/r0drv/linux/memobj-r0drv-linux.c | |
+++ work/vboxdrv/r0drv/linux/memobj-r0drv-linux.c | |
@@ -901,6 +901,9 @@ static struct page *rtR0MemObjLinuxVirtToPage(void *pv) | |
union | |
{ | |
pgd_t Global; | |
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) | |
+ p4d_t Four; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/lib/swiotlb.c b/lib/swiotlb.c | |
index fece57566d45..64fc24c4d4c6 100644 | |
--- a/lib/swiotlb.c | |
+++ b/lib/swiotlb.c | |
@@ -591,6 +591,7 @@ phys_addr_t swiotlb_tbl_map_single(struct device *hwdev, | |
return tlb_addr; | |
} | |
+EXPORT_SYMBOL_GPL(swiotlb_tbl_map_single); | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/vboxpci/linux/VBoxPci-linux.c b/vboxpci/linux/VBoxPci-linux.c | |
index 4484496..a460d5b 100644 | |
--- a/vboxpci/linux/VBoxPci-linux.c | |
+++ b/vboxpci/linux/VBoxPci-linux.c | |
@@ -89,7 +89,7 @@ MODULE_VERSION(VBOX_VERSION_STRING " r" RT_XSTR(VBOX_SVN_REV)); | |
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20) | |
# define PCI_DEV_GET(v,d,p) pci_get_device(v,d,p) | |
# define PCI_DEV_PUT(x) pci_dev_put(x) | |
-# define PCI_DEV_GET_SLOT(bus, devfn) pci_get_bus_and_slot(bus, devfn) | |
+# define PCI_DEV_GET_SLOT(bus, devfn) pci_get_domain_bus_and_slot(0, bus, devfn) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- work/vboxdrv/r0drv/linux/memobj-r0drv-linux.c 2017-01-12 10:04:01.000000000 -0500 | |
+++ work/vboxdrv/r0drv/linux/memobj-r0drv-linux.cb 2017-05-28 18:04:25.607775983 -0400 | |
@@ -1,4 +1,4 @@ | |
-/* $Id: memobj-r0drv-linux.c 112804 2017-01-12 15:03:51Z fmehnert $ */ | |
+/* $Id: memobj-r0drv-linux.c 66930 2017-05-17 10:45:48Z vboxsync $ */ | |
/** @file | |
* IPRT - Ring-0 Memory Objects, Linux. | |
*/ | |
@@ -902,6 +902,9 @@ | |
union |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/kernel/nvidia-drm/nvidia-drm-connector.c b/kernel/nvidia-drm/nvidia-drm-connector.c | |
index dbda66d..5cc1eca 100644 | |
--- a/kernel/nvidia-drm/nvidia-drm-connector.c | |
+++ b/kernel/nvidia-drm/nvidia-drm-connector.c | |
@@ -226,7 +226,7 @@ static int nv_drm_connector_get_modes(struct drm_connector *connector) | |
if (nv_connector->edid != NULL) { | |
- drm_mode_connector_update_edid_property( | |
+ drm_connector_update_edid_property( |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#include <vector> | |
#include <numeric> | |
class Solution { | |
public: | |
int summize(std::vector<int> nums) | |
{ | |
int result=std::accumulate(nums.begin(),nums.end(),0); | |
if (nums.size() == 2) | |
{ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#include <vector> | |
#include <algorithm> | |
struct SubArray | |
{ | |
std::vector<int>::iterator low; | |
std::vector<int>::iterator high; | |
int sum; | |
}; |