12:18 p.m.
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv920
Modified Files:
nvidia-kmod.spec sources
Added Files:
nvidia_3.13_kernel.patch
Log Message:
* Sat Jan 25 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1:331.38-5
- Disable uvm when NV_BUILD_MODULE_INSTANCES is set
- Simplify patch
nvidia_3.13_kernel.patch:
nv-acpi.c | 3 +++
uvm/nvidia_uvm_linux.h | 10 ++++++++--
2 files changed, 11 insertions(+), 2 deletions(-)
--- NEW FILE nvidia_3.13_kernel.patch ---
--- a/kernel/nv-acpi.c
+++ b/kernel/nv-acpi.c
@@ -303,7 +307,10 @@ static int nv_acpi_remove(struct acpi_de
if (pNvAcpiObject->notify_handler_installed)
{
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
+ /* beginning with 3.13, acpi_remove_notify_handler() waits for events to finish */
NV_ACPI_OS_WAIT_EVENTS_COMPLETE();
+#endif
// remove event notifier
status = acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY,
nv_acpi_event);
--- a/kernel/uvm/nvidia_uvm_linux.h
+++ b/kernel/uvm/nvidia_uvm_linux.h
@@ -405,11 +405,17 @@ typedef void irqreturn_t;
// not require the RCU's read lock on current->cred.
//
//
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
+#define NV_KUID_TO_UID(value) (__kuid_val(value))
+#else
+#define NV_KUID_TO_UID(value) (value)
+#endif
+
#if defined(NV_TASK_STRUCT_HAS_CRED)
#define NV_CURRENT_EUID() \
- (((typeof(*current->cred) __force __kernel *)current->cred)->euid)
+ NV_KUID_TO_UID(((typeof(*current->cred) __force __kernel
*)current->cred)->euid)
#else
-#define NV_CURRENT_EUID() (current->euid)
+#define NV_CURRENT_EUID() NV_KUID_TO_UID(current->euid)
#endif
#define NV_ATOMIC_SET(data,val) atomic_set(&(data), (val))
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-20/nvidia-kmod.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- nvidia-kmod.spec 17 Jan 2014 20:23:41 -0000 1.151
+++ nvidia-kmod.spec 25 Jan 2014 12:18:19 -0000 1.152
@@ -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: 331.20
+Version: 331.38
# Taken over by kmodtool
-Release: 10%{?dist}.4
+Release: 5%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -25,6 +25,7 @@
Source0: nvidia-kmod-data-%{version}.tar.xz
Patch0: nv-linux-arm.patch
+Patch1: nvidia_3.13_kernel.patch
Source11: nvidia-kmodtool-excludekernel-filterfile
@@ -50,11 +51,11 @@
%setup -q -c -T -a 0
# patch loop
-#for arch in x86_64 i686 armv7hl
-for arch in armv7hl
+for arch in x86_64 i686 armv7hl
do
pushd nvidiapkg-${arch}
%patch0 -p1
+%patch1 -p1
popd
done
@@ -72,12 +73,14 @@
%{?_nv_build_module_instances:NV_BUILD_MODULE_INSTANCES=%{?_nv_build_module_instances}} \
module
popd
+%{!?_nv_build_module_instances:
pushd _kmod_build_${kernel_version%%___*}/kernel/uvm
make %{?_smp_mflags} \
KERNEL_UNAME="${kernel_version%%___*}"
SYSSRC="${kernel_version##*___}" \
IGNORE_CC_MISMATCH=1 IGNORE_XEN_PRESENCE=1 IGNORE_PREEMPT_RT_PRESENCE=1 \
module
popd
+}
done
@@ -96,8 +99,22 @@
%changelog
-* Fri Jan 17 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1:331.20-10.4
-- Rebuilt for kernel
+* Sat Jan 25 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1:331.38-5
+- Disable uvm when NV_BUILD_MODULE_INSTANCES is set
+- Simplify patch
+
+* Tue Jan 21 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 1:331.38-4
+- make more changes to 3.13 kernel patch
+
+* Mon Jan 13 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 1:331.38-3
+- fix patch for 3.13 kernel
+
+* Mon Jan 13 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 1:331.38-2
+- rebuild for akmod
+
+* Mon Jan 13 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 1:331.38-1
+- Update to 331.38 release
+- Patch for 3.13 kernel
* Sun Jan 12 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1:331.20-10.3
- Rebuilt for kernel
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-20/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources 7 Nov 2013 01:18:06 -0000 1.62
+++ sources 25 Jan 2014 12:18:19 -0000 1.63
@@ -1 +1 @@
-55ff14e616146f9d6828a6594bb159d5 nvidia-kmod-data-331.20.tar.xz
+9d74494d1d864790a2637ee0ef84074f nvidia-kmod-data-331.38.tar.xz