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 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/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/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 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/drivers/acpi/property.c b/drivers/acpi/property.c | |
index c1c216163de3..23693637f17b 100644 | |
--- a/drivers/acpi/property.c | |
+++ b/drivers/acpi/property.c | |
@@ -1288,7 +1288,7 @@ static int acpi_fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode, | |
.graph_get_port_parent = acpi_fwnode_get_parent, \ | |
.graph_parse_endpoint = acpi_fwnode_graph_parse_endpoint, \ | |
}; \ | |
- EXPORT_SYMBOL_GPL(ops) | |
+ EXPORT_SYMBOL(ops) |
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-crtc.c b/kernel/nvidia-drm/nvidia-drm-crtc.c | |
index 4d9bdf3..e2f4f46 100644 | |
--- a/kernel/nvidia-drm/nvidia-drm-crtc.c | |
+++ b/kernel/nvidia-drm/nvidia-drm-crtc.c | |
@@ -162,7 +162,8 @@ static void nvidia_crtc_disable(struct drm_crtc *crtc) | |
} | |
-static void nvidia_crtc_enable(struct drm_crtc *crtc) | |
+static void nvidia_crtc_enable(struct drm_crtc *crtc, |
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/waitqueue-r0drv-linux.h 2017-05-28 17:18:48.486626052 -0400 | |
+++ work/vboxdrv/r0drv/linux/waitqueue-r0drv-linux.hb 2017-07-04 23:38:48.235213259 -0400 | |
@@ -46,7 +46,7 @@ | |
typedef struct RTR0SEMLNXWAIT | |
{ | |
/** The wait queue entry. */ | |
- wait_queue_t WaitQE; | |
+ wait_queue_entry_t WaitQE; | |
/** The absolute timeout given as nano seconds since the start of the | |
* monotonic clock. */ |
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 -ru NVIDIA-Linux-x86_64-375.39/kernel/common/inc/nv-mm.h NVIDIA-Linux-x86_64-375.39-r1/kernel/common/inc/nv-mm.h | |
--- NVIDIA-Linux-x86_64-375.39/kernel/common/inc/nv-mm.h 2017-01-31 21:50:37.000000000 -0500 | |
+++ NVIDIA-Linux-x86_64-375.39-r1/kernel/common/inc/nv-mm.h 2017-03-30 23:36:39.392964700 -0400 | |
@@ -131,11 +131,7 @@ | |
#if defined(NV_VM_FAULT_PRESENT) | |
static inline unsigned long nv_page_fault_va(struct vm_fault *vmf) | |
{ | |
- #if defined(NV_VM_FAULT_HAS_ADDRESS) | |
return vmf->address; | |
- #else |