Date: Wednesday, November 6, 2013 @ 01:25:07 Author: thomas Revision: 198993
upgpkg: nvidia 325.15-11: update for Linux 3.12 Added: nvidia/trunk/nvidia-linux-3.12.patch Modified: nvidia/trunk/PKGBUILD Deleted: nvidia/trunk/nvidia-linux-3.11.patch -------------------------+ PKGBUILD | 24 ++++++++++++++---------- nvidia-linux-3.11.patch | 25 ------------------------- nvidia-linux-3.12.patch | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 35 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-11-05 22:36:26 UTC (rev 198992) +++ PKGBUILD 2013-11-06 00:25:07 UTC (rev 198993) @@ -3,19 +3,19 @@ pkgname=nvidia pkgver=325.15 -_extramodules=extramodules-3.11-ARCH -pkgrel=10 +_extramodules=extramodules-3.12-ARCH +pkgrel=11 pkgdesc="NVIDIA drivers for linux" arch=('i686' 'x86_64') url="http://www.nvidia.com/" -depends=('linux>=3.11' 'linux<3.12' "nvidia-libgl" "nvidia-utils=${pkgver}") -makedepends=('linux-headers>=3.11' 'linux-headers<3.12') +depends=('linux>=3.12' 'linux<3.13' "nvidia-libgl" "nvidia-utils=${pkgver}") +makedepends=('linux-headers>=3.12' 'linux-headers<3.13') conflicts=('nvidia-96xx' 'nvidia-173xx') license=('custom') install=nvidia.install options=(!strip) -source=('nvidia-linux-3.11.patch') -md5sums=('5c962760de069ed4ad34e64d5988686a') +source=('nvidia-linux-3.12.patch') +md5sums=('d267069bc456de269424b4e1b46a3745') if [ "$CARCH" = "i686" ]; then _arch='x86' @@ -29,12 +29,16 @@ md5sums+=('63b2caa0cb128efa1a7808d7bddb2074') fi +prepare() { + cd "${srcdir}" + sh "${_pkg}.run" --extract-only + cd "${_pkg}" + patch -Np1 -i ${srcdir}/nvidia-linux-3.12.patch +} + build() { _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" - cd "${srcdir}" - sh "${_pkg}.run" --extract-only - cd "${_pkg}/kernel" - patch -Np2 -i ${srcdir}/nvidia-linux-3.11.patch + cd "${srcdir}"/"${_pkg}"/kernel make SYSSRC=/usr/lib/modules/"${_kernver}/build" module } Deleted: nvidia-linux-3.11.patch =================================================================== --- nvidia-linux-3.11.patch 2013-11-05 22:36:26 UTC (rev 198992) +++ nvidia-linux-3.11.patch 2013-11-06 00:25:07 UTC (rev 198993) @@ -1,25 +0,0 @@ -From 8a8647ad942c8ac5161e1335f7f3e9dbb34dbf9e Mon Sep 17 00:00:00 2001 -From: Lukas Elsner <o...@mindrunner.de> -Date: Wed, 17 Jul 2013 01:16:04 +0200 -Subject: [PATCH] replace num_physpages with totalram_pages - ---- - kernel/nv-linux.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kernel/nv-linux.h b/kernel/nv-linux.h -index 4e5ed89..46c51ec 100644 ---- a/kernel/nv-linux.h -+++ b/kernel/nv-linux.h -@@ -957,7 +957,7 @@ static inline int nv_execute_on_all_cpus(void (*func)(void *info), void *info) - #endif - - #if !defined(NV_VMWARE) --#define NV_NUM_PHYSPAGES num_physpages -+#define NV_NUM_PHYSPAGES totalram_pages - #define NV_GET_CURRENT_PROCESS() current->tgid - #define NV_IN_ATOMIC() in_atomic() - #define NV_LOCAL_BH_DISABLE() local_bh_disable() --- -1.8.3.2 - Added: nvidia-linux-3.12.patch =================================================================== --- nvidia-linux-3.12.patch (rev 0) +++ nvidia-linux-3.12.patch 2013-11-06 00:25:07 UTC (rev 198993) @@ -0,0 +1,40 @@ +diff -Nur NVIDIA-Linux-x86_64-325.15-no-compat32.orig/kernel/nv-drm.c NVIDIA-Linux-x86_64-325.15-no-compat32/kernel/nv-drm.c +--- NVIDIA-Linux-x86_64-325.15-no-compat32.orig/kernel/nv-drm.c 2013-08-01 02:49:26.000000000 +0200 ++++ NVIDIA-Linux-x86_64-325.15-no-compat32/kernel/nv-drm.c 2013-11-06 01:16:40.547079457 +0100 +@@ -106,7 +106,6 @@ + .unlocked_ioctl = drm_ioctl, + .mmap = drm_gem_mmap, + .poll = drm_poll, +- .fasync = drm_fasync, + .read = drm_read, + .llseek = noop_llseek, + }; +@@ -202,12 +201,7 @@ + memset(&nv_obj->base, 0, sizeof(nv_obj->base)); + nv_obj->pages = pages; + +- ret = drm_gem_private_object_init(nvl->drm, &nv_obj->base, size); +- if (ret) +- { +- status = RM_ERR_OPERATING_SYSTEM; +- goto done; +- } ++ drm_gem_private_object_init(nvl->drm, &nv_obj->base, size); + + ret = drm_gem_handle_create(file_priv, &nv_obj->base, handle); + if (ret) +diff -Nur NVIDIA-Linux-x86_64-325.15-no-compat32.orig/kernel/nv-linux.h NVIDIA-Linux-x86_64-325.15-no-compat32/kernel/nv-linux.h +--- NVIDIA-Linux-x86_64-325.15-no-compat32.orig/kernel/nv-linux.h 2013-08-01 02:49:26.000000000 +0200 ++++ NVIDIA-Linux-x86_64-325.15-no-compat32/kernel/nv-linux.h 2013-11-06 01:15:41.838303440 +0100 +@@ -958,7 +958,11 @@ + #endif + + #if !defined(NV_VMWARE) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0) + #define NV_NUM_PHYSPAGES num_physpages ++#else ++#define NV_NUM_PHYSPAGES get_num_physpages() ++#endif + #define NV_GET_CURRENT_PROCESS() current->tgid + #define NV_IN_ATOMIC() in_atomic() + #define NV_LOCAL_BH_DISABLE() local_bh_disable()