diff options
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | 4.14.21_4.15.5-npfeiler-flush_tlb_one_kernel.patch | 14 | ||||
-rw-r--r-- | PKGBUILD | 13 |
3 files changed, 27 insertions, 8 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Sun Jan 21 20:27:03 UTC 2018 +# Sun Apr 8 19:54:08 UTC 2018 pkgbase = catalyst-generator pkgdesc = AMD/ATI drivers. Generator of catalyst-{kernver} packages with fglrx module inside. pkgver = 15.9 - pkgrel = 18 + pkgrel = 19 url = http://www.amd.com install = catalyst-generator.install arch = i686 @@ -15,7 +15,7 @@ pkgbase = catalyst-generator depends = make depends = patch depends = linux>=3.0 - depends = linux<4.15 + depends = linux<4.16 depends = linux-headers optdepends = linux-headers: to build the fglrx module for the linux kernel optdepends = linux-lts-headers: to build the fglrx module for the linux-lts kernel @@ -56,6 +56,7 @@ pkgbase = catalyst-generator source = 4.12-npfeiler-movsl_mask.patch source = 4.13-npfeiler-wait_queue_t.patch source = 4.14-npfeiler-task_struct-mm_segment_t.patch + source = 4.14.21_4.15.5-npfeiler-flush_tlb_one_kernel.patch md5sums = d2de2df6946b452c266a3c892e6e46ff md5sums = 543e818f543f2897beca49101226e460 md5sums = a555dc9a3eb062d7ca4efbf7e0713a3a @@ -83,6 +84,7 @@ pkgbase = catalyst-generator md5sums = cb25bc7fbb7d5cb1c07d2f3fa5fda826 md5sums = 0a725f40bc980d578cbed3e57a05b765 md5sums = 5ba3bf9f58aa63c1849b056cf23022c9 + md5sums = 10af58c21e4e972115dda6dbd8279594 pkgname = catalyst-generator diff --git a/4.14.21_4.15.5-npfeiler-flush_tlb_one_kernel.patch b/4.14.21_4.15.5-npfeiler-flush_tlb_one_kernel.patch new file mode 100644 index 000000000000..1f9b7a4a777b --- /dev/null +++ b/4.14.21_4.15.5-npfeiler-flush_tlb_one_kernel.patch @@ -0,0 +1,14 @@ +--- archive_files/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-12-18 19:47:41.000000000 +0100 ++++ archive_filesb/common/lib/modules/fglrx/build_mod/firegl_public.c 2018-02-25 17:33:11.469309861 +0100 +@@ -2949,7 +2949,11 @@ + static void kcl_flush_tlb_one(void *va) + { + unsigned long *addr = (unsigned long *)va; ++# if (LINUX_VERSION_CODE < KERNEL_VERSION(4,14,21)) + __flush_tlb_one(*addr); ++# else ++ __flush_tlb_one_kernel(*addr); ++# endif + } + + /** /brief Flush one page on all cpus @@ -13,19 +13,19 @@ # Contributor: gentoo (part of 4.3 kernel patches) # Contributor: Philip Muller @ Manjaro (4.4 kernel patch) # Contributor: sling00 (4.10 kernel patch) -# Contributor: npfeiler (4.11, 4.12, 4.13 and 4.14 kernel patch) +# Contributor: npfeiler (4.11, 4.12, 4.13, 4.14 and 4.15.5 kernel patch) pkgname=catalyst-generator pkgver=15.9 -pkgrel=18 +pkgrel=19 _amdver=15.201.1151 pkgdesc="AMD/ATI drivers. Generator of catalyst-{kernver} packages with fglrx module inside." arch=('i686' 'x86_64') url="http://www.amd.com" license=('custom') options=('staticlibs' 'libtool' '!strip' '!upx') -depends=('catalyst-utils' 'gcc-libs' 'gcc>4.0.0' 'make' 'patch' 'linux>=3.0' 'linux<4.15' 'linux-headers') +depends=('catalyst-utils' 'gcc-libs' 'gcc>4.0.0' 'make' 'patch' 'linux>=3.0' 'linux<4.16' 'linux-headers') optdepends=('linux-headers: to build the fglrx module for the linux kernel' 'linux-lts-headers: to build the fglrx module for the linux-lts kernel') conflicts=('catalyst-test' 'catalyst-hook' 'catalyst' 'catalyst-daemon' 'catalyst-dkms') @@ -62,7 +62,8 @@ source=( 4.12-arch-remove_clts.patch 4.12-npfeiler-movsl_mask.patch 4.13-npfeiler-wait_queue_t.patch - 4.14-npfeiler-task_struct-mm_segment_t.patch) + 4.14-npfeiler-task_struct-mm_segment_t.patch + 4.14.21_4.15.5-npfeiler-flush_tlb_one_kernel.patch) md5sums=('d2de2df6946b452c266a3c892e6e46ff' '543e818f543f2897beca49101226e460' @@ -90,7 +91,8 @@ md5sums=('d2de2df6946b452c266a3c892e6e46ff' '782769206ed12ded10c347be3e476729' 'cb25bc7fbb7d5cb1c07d2f3fa5fda826' '0a725f40bc980d578cbed3e57a05b765' - '5ba3bf9f58aa63c1849b056cf23022c9') + '5ba3bf9f58aa63c1849b056cf23022c9' + '10af58c21e4e972115dda6dbd8279594') build() { @@ -123,6 +125,7 @@ package() { patch -Np1 -i ../4.12-npfeiler-movsl_mask.patch patch -Np1 -i ../4.13-npfeiler-wait_queue_t.patch patch -Np1 -i ../4.14-npfeiler-task_struct-mm_segment_t.patch + patch -Np1 -i ../4.14.21_4.15.5-npfeiler-flush_tlb_one_kernel.patch # Prepare modules source files _archdir=x86_64 |