From 62071ebe1c86ff439ed0bc4b6bdd4f6f9f2737fa Mon Sep 17 00:00:00 2001 From: Alberto Milone <alberto.milone@canonical.com> Date: Mon, 16 Nov 2015 11:34:16 +0100 Subject: [PATCH 1/1] Add support for Linux 4.3 diff -Naur fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c --- fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-12-31 11:12:34.000000000 +0100 +++ fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-12-31 11:14:25.485800244 +0100 @@ -636,7 +636,11 @@ len = snprintf(buf, request, "%d\n", major); #else +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0) len = seq_printf(m, "%d\n", major); +#else + seq_printf(m, "%d\n", major); +#endif #endif KCL_DEBUG1(FN_FIREGL_PROC, "return len=%i\n",len); @@ -3440,7 +3444,11 @@ int ATI_API_CALL KCL_MEM_MTRR_AddRegionWc(unsigned long base, unsigned long size) { #ifdef CONFIG_MTRR +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0) return mtrr_add(base, size, MTRR_TYPE_WRCOMB, 1); +#else + return arch_phys_wc_add(base, size); +#endif #else /* !CONFIG_MTRR */ return -EPERM; #endif /* !CONFIG_MTRR */ @@ -3449,7 +3457,12 @@ int ATI_API_CALL KCL_MEM_MTRR_DeleteRegion(int reg, unsigned long base, unsigned long size) { #ifdef CONFIG_MTRR +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0) return mtrr_del(reg, base, size); +#else + arch_phys_wc_del(reg); + return reg; +#endif #else /* !CONFIG_MTRR */ return -EPERM; #endif /* !CONFIG_MTRR */