Author: leigh123linux Update of /cvs/nonfree/rpms/nvidia-kmod/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv17285 Modified Files: kernel_v3.11.patch nvidia-kmod.spec Log Message: * Mon Sep 16 2013 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1:325.15-3 - patch for 3.12 git kernel kernel_v3.11.patch: nv-drm.c | 8 ++++++++ nv-linux.h | 4 ++++ nv.c | 4 ++++ 3 files changed, 16 insertions(+) Index: kernel_v3.11.patch =================================================================== RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/kernel_v3.11.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kernel_v3.11.patch 6 Aug 2013 10:12:44 -0000 1.1 +++ kernel_v3.11.patch 16 Sep 2013 15:08:08 -0000 1.2 @@ -1,3 +1,4 @@ + --- a/kernel/nv-linux.h +++ b/kernel/nv-linux.h @@ -957,7 +957,11 @@ static inline int nv_execute_on_all_cpus @@ -12,3 +13,49 @@ #define NV_GET_CURRENT_PROCESS() current->tgid #define NV_IN_ATOMIC() in_atomic() #define NV_LOCAL_BH_DISABLE() local_bh_disable() +--- a/kernel/nv-drm.c ++++ b/kernel/nv-drm.c +@@ -106,7 +106,11 @@ static const struct file_operations nv_d + .unlocked_ioctl = drm_ioctl, + .mmap = drm_gem_mmap, + .poll = drm_poll, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0) ++// .fasync = drm_fasync, ++#else + .fasync = drm_fasync, ++#endif + .read = drm_read, + .llseek = noop_llseek, + }; +@@ -202,12 +206,16 @@ RM_STATUS NV_API_CALL nv_alloc_os_descri + memset(&nv_obj->base, 0, sizeof(nv_obj->base)); + nv_obj->pages = pages; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0) ++ drm_gem_private_object_init(nvl->drm, &nv_obj->base, size); ++#else + ret = drm_gem_private_object_init(nvl->drm, &nv_obj->base, size); + if (ret) + { + status = RM_ERR_OPERATING_SYSTEM; + goto done; + } ++#endif + + ret = drm_gem_handle_create(file_priv, &nv_obj->base, handle); + if (ret) +--- a/kernel/nv.c ++++ b/kernel/nv.c +@@ -16,8 +16,12 @@ + #include "rmil.h" + + #if defined(MODULE_LICENSE) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0) ++MODULE_LICENSE("GPL"); ++#else + MODULE_LICENSE("NVIDIA"); + #endif ++#endif + #if defined(MODULE_INFO) + MODULE_INFO(supported, "external"); + #endif Index: nvidia-kmod.spec =================================================================== RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v retrieving revision 1.133 retrieving revision 1.134 diff -u -r1.133 -r1.134 --- nvidia-kmod.spec 6 Aug 2013 11:02:39 -0000 1.133 +++ nvidia-kmod.spec 16 Sep 2013 15:08:08 -0000 1.134 @@ -9,7 +9,7 @@ Epoch: 1 Version: 325.15 # Taken over by kmodtool -Release: 2%{?dist} +Release: 3%{?dist} Summary: NVIDIA display driver kernel module Group: System Environment/Kernel License: Redistributable, no modification permitted @@ -79,6 +79,9 @@ %changelog +* Mon Sep 16 2013 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1:325.15-3 +- patch for 3.12 git kernel + * Tue Aug 06 2013 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1:325.15-2 - rebuild for akmod as pae marco is broken