Date: Thursday, July 2, 2015 @ 03:39:42 Author: foutrelis Revision: 241682
upgpkg: nvidia-304xx 304.125-17 Rebuild for symbol changes between Linux 4.0.2 and Linux 4.0.6. Added: nvidia-304xx/trunk/nvidia-4.0.patch Modified: nvidia-304xx/trunk/PKGBUILD ------------------+ PKGBUILD | 4 ++-- nvidia-4.0.patch | 28 ++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-07-02 01:39:38 UTC (rev 241681) +++ PKGBUILD 2015-07-02 01:39:42 UTC (rev 241682) @@ -5,7 +5,7 @@ pkgname=nvidia-304xx pkgver=304.125 _extramodules=extramodules-4.0-ARCH -pkgrel=16 +pkgrel=17 pkgdesc="NVIDIA drivers for linux, 304xx legacy branch" arch=('i686' 'x86_64') url="http://www.nvidia.com/" @@ -50,7 +50,7 @@ "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" install -d -m755 "${pkgdir}/usr/lib/modprobe.d" echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" - sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install" + sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/${pkgname}.install" gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" # the license file is part of nvidia-304xx-utils - the module depends on it, so we don't ship it another time. Added: nvidia-4.0.patch =================================================================== --- nvidia-4.0.patch (rev 0) +++ nvidia-4.0.patch 2015-07-02 01:39:42 UTC (rev 241682) @@ -0,0 +1,28 @@ +--- kernel/nv-pat.c~ 2015-02-22 20:39:43.889075396 -0800 ++++ kernel/nv-pat.c 2015-02-22 20:29:33.519735577 -0800 +@@ -35,8 +35,13 @@ + unsigned long cr0 = read_cr0(); + write_cr0(((cr0 & (0xdfffffff)) | 0x40000000)); + wbinvd(); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0) ++ *cr4 = __read_cr4(); ++ if (*cr4 & 0x80) __write_cr4(*cr4 & ~0x80); ++#else + *cr4 = read_cr4(); + if (*cr4 & 0x80) write_cr4(*cr4 & ~0x80); ++#endif + __flush_tlb(); + } + +@@ -46,7 +46,11 @@ + wbinvd(); + __flush_tlb(); + write_cr0((cr0 & 0x9fffffff)); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0) ++ if (cr4 & 0x80) __write_cr4(cr4); ++#else + if (cr4 & 0x80) write_cr4(cr4); ++#endif + } + + static int nv_determine_pat_mode(void)