rpms/nvidia-kmod/devel 4.3_kernel.patch, NONE, 1.1 nvidia-kmod.spec, 1.222, 1.223
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20161
Modified Files:
nvidia-kmod.spec
Added Files:
4.3_kernel.patch
Log Message:
* Mon Sep 14 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 1:355.11-2
- patch for 4.3rc kernel
4.3_kernel.patch:
nv-procfs.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
--- NEW FILE 4.3_kernel.patch ---
--- a/kernel/nvidia/nv-procfs.c
+++ b/kernel/nvidia/nv-procfs.c
@@ -359,8 +359,12 @@
nvl = NV_GET_NVL_FROM_NV_STATE(nv);
registry_keys = ((nvl != NULL) ?
nvl->registry_keys : nv_registry_keys);
-
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0)
+ seq_printf(s, "Binary: \"%s\"\n", registry_keys);
+ return 0;
+#else
return seq_printf(s, "Binary: \"%s\"\n", registry_keys);
+#endif
}
static ssize_t
@@ -560,7 +564,12 @@
void *v
)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0)
+ seq_puts(s, s->private);
+ return 0;
+#else
return seq_puts(s, s->private);
+#endif
}
NV_DEFINE_PROCFS_SINGLE_FILE(text_file);
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- nvidia-kmod.spec 2 Sep 2015 23:21:39 -0000 1.222
+++ nvidia-kmod.spec 14 Sep 2015 19:35:42 -0000 1.223
@@ -9,7 +9,7 @@
Epoch: 1
Version: 355.11
# Taken over by kmodtool
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -18,6 +18,7 @@
Source11: nvidia-kmodtool-excludekernel-filterfile
Patch0: nv-linux-arm.patch
Patch1: nv-linux-arm2.patch
+Patch2: 4.3_kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,6 +46,7 @@
# patch loop
%patch0 -p1
%patch1 -p1
+%patch2 -p1
for kernel_version in %{?kernel_versions} ; do
@@ -77,6 +79,9 @@
%changelog
+* Mon Sep 14 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 1:355.11-2
+- patch for 4.3rc kernel
+
* Mon Aug 31 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 1:355.11-1
- Update to 355.11