rpms/nvidia-kmod/F-18 3.11_kernel.patch, NONE, 1.1 nvidia-kmod.spec, 1.167, 1.168
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4356
Modified Files:
nvidia-kmod.spec
Added Files:
3.11_kernel.patch
Log Message:
* Thu Oct 10 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:319.60-2
- patch for 3.11 kernel
3.11_kernel.patch:
nv-linux.h | 4 ++++
1 file changed, 4 insertions(+)
--- NEW FILE 3.11_kernel.patch ---
--- a/kernel/nv-linux.h
+++ b/kernel/nv-linux.h
@@ -1037,7 +1037,11 @@ static inline int nv_execute_on_all_cpus
#endif
#if !defined(NV_VMWARE)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
+#define NV_NUM_PHYSPAGES get_num_physpages()
+#else
#define NV_NUM_PHYSPAGES num_physpages
+#endif
#define NV_GET_CURRENT_PROCESS() current->tgid
#define NV_IN_ATOMIC() in_atomic()
#define NV_LOCAL_BH_DISABLE() local_bh_disable()
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-18/nvidia-kmod.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- nvidia-kmod.spec 5 Oct 2013 08:45:02 -0000 1.167
+++ nvidia-kmod.spec 10 Oct 2013 19:00:49 -0000 1.168
@@ -3,13 +3,13 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%global buildforkernels newest
+%global buildforkernels current
Name: nvidia-kmod
Epoch: 1
Version: 319.60
# Taken over by kmodtool
-Release: 1%{?dist}.1
+Release: 2%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -20,7 +20,9 @@
Source0: nvidia-kmod-data-%{version}.tar.xz
-Source11: nvidia-kmodtool-excludekernel-filterfile
+Source11: nvidia-kmodtool-excludekernel-filterfile
+
+Patch0: 3.11_kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -47,7 +49,7 @@
for arch in x86_64 i686 armv7hl
do
pushd nvidiapkg-${arch}
-echo "Nothing to patch"
+%patch0 -p1
popd
done
@@ -77,6 +79,9 @@
%changelog
+* Thu Oct 10 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:319.60-2
+- patch for 3.11 kernel
+
* Sat Oct 05 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.60-1.1
- Rebuilt for kernel