diff -uprN driver.orig/xclng/drm/xocl/subdev/icap.c driver/xclng/drm/xocl/subdev/icap.c --- driver.orig/xclng/drm/xocl/subdev/icap.c 2018-06-14 21:56:19.000000000 -0400 +++ driver/xclng/drm/xocl/subdev/icap.c 2018-09-07 21:18:05.201063947 -0400 @@ -33,7 +33,8 @@ #include "xclbin.h" #include "../xocl_drv.h" -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) +//#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) +#if 0 static xuid_t uuid_null = NULL_UUID_LE; #endif diff -uprN driver.orig/xclng/drm/xocl/userpf/xocl_bo.c driver/xclng/drm/xocl/userpf/xocl_bo.c --- driver.orig/xclng/drm/xocl/userpf/xocl_bo.c 2018-06-14 20:37:30.000000000 -0400 +++ driver/xclng/drm/xocl/userpf/xocl_bo.c 2018-09-07 21:22:44.629289397 -0400 @@ -41,7 +41,8 @@ #define BO_DEBUG(fmt, args...) #endif -#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0) +//#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0) +#if 1 static inline void drm_free_large(void *ptr) { kvfree(ptr); diff -uprN driver.orig/xclng/drm/xocl/userpf/xocl_drm.c driver/xclng/drm/xocl/userpf/xocl_drm.c --- driver.orig/xclng/drm/xocl/userpf/xocl_drm.c 2018-06-14 20:37:30.000000000 -0400 +++ driver/xclng/drm/xocl/userpf/xocl_drm.c 2018-09-07 21:24:34.749407791 -0400 @@ -414,7 +414,8 @@ int xocl_mm_insert_node(struct xocl_dev struct drm_mm_node *node, u64 size) { return drm_mm_insert_node_generic(&xdev->mm[ddr], node, size, PAGE_SIZE, -#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0) +//#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0) +#if 1 0, 0); #else 0, 0, 0); diff -uprN driver.orig/xclng/drm/xocl/userpf/xocl_ioctl.c driver/xclng/drm/xocl/userpf/xocl_ioctl.c --- driver.orig/xclng/drm/xocl/userpf/xocl_ioctl.c 2018-06-14 20:37:30.000000000 -0400 +++ driver/xclng/drm/xocl/userpf/xocl_ioctl.c 2018-09-07 21:26:34.170367262 -0400 @@ -26,7 +26,8 @@ #include #include "common.h" -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) +//#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) +#if 0 xuid_t uuid_null = NULL_UUID_LE; #endif diff -uprN driver.orig/xclng/drm/xocl/xocl_drv.h driver/xclng/drm/xocl/xocl_drv.h --- driver.orig/xclng/drm/xocl/xocl_drv.h 2018-06-14 20:37:30.000000000 -0400 +++ driver/xclng/drm/xocl/xocl_drv.h 2018-09-07 21:13:43.310530546 -0400 @@ -28,7 +28,8 @@ #include "xocl_subdev.h" /* UUID helper functions not present in older kernels */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) +//#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) +#if 0 static inline bool uuid_equal(const xuid_t *u1, const xuid_t *u2) { return memcmp(u1, u2, sizeof(xuid_t)) == 0;