11:05 p.m.
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-173xx-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26977
Modified Files:
nvidia-173xx-kmod.spec sources
Added Files:
3.7_kernel.patch
Removed Files:
3.6_kernel.patch
Log Message:
* Sat Jan 19 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 173.14.36-1
- Update to 173.14.36
- patch for 3.7 kernel
3.7_kernel.patch:
conftest.sh | 7 ++++++-
nv.c | 4 ++++
2 files changed, 10 insertions(+), 1 deletion(-)
--- NEW FILE 3.7_kernel.patch ---
--- a/usr/src/nv/conftest.sh
+++ b/usr/src/nv/conftest.sh
@@ -127,6 +127,7 @@ build_cflags() {
if [ "$ARCH" = "i386" -o "$ARCH" =
"x86_64" ]; then
MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
MACH_CFLAGS="$MACH_CFLAGS
-I$SOURCES/arch/x86/include/asm/mach-default"
+ MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/arch/x86/include/uapi"
fi
if [ "$XEN_PRESENT" != "0" ]; then
MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-xen $MACH_CFLAGS"
@@ -136,6 +137,7 @@ build_cflags() {
if [ "$ARCH" = "i386" -o "$ARCH" =
"x86_64" ]; then
MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default"
MACH_CFLAGS="$MACH_CFLAGS
-I$SOURCES/arch/x86/include/asm/mach-default"
+ MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/arch/x86/include/uapi"
fi
if [ "$XEN_PRESENT" != "0" ]; then
MACH_CFLAGS="-I$HEADERS/asm/mach-xen $MACH_CFLAGS"
@@ -143,9 +145,12 @@ build_cflags() {
fi
CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS
$AUTOCONF_CFLAGS"
+ CFLAGS="$CFLAGS -I$HEADERS -I$HEADERS/uapi"
if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64"
]; then
- CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include
-I$OUTPUT/arch/x86/include/generated"
+ CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include"
+ CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated"
+ CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated/uapi"
fi
if [ -n "$BUILD_PARAMS" ]; then
CFLAGS="$CFLAGS -D$BUILD_PARAMS"
--- a/usr/src/nv/nv.c
+++ b/usr/src/nv/nv.c
@@ -2609,7 +2609,11 @@ int nv_kern_mmap(
/* prevent the swapper from swapping it out */
/* mark the memory i/o so the buffers aren't dumped on core dumps */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
+ vma->vm_flags |= (VM_IO | VM_LOCKED | (VM_DONTEXPAND | VM_DONTDUMP));
+#else
vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED);
+#endif
}
NV_VMA_FILE(vma) = file;
Index: nvidia-173xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-173xx-kmod/F-17/nvidia-173xx-kmod.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- nvidia-173xx-kmod.spec 17 Jan 2013 09:27:42 -0000 1.83
+++ nvidia-173xx-kmod.spec 19 Jan 2013 23:05:29 -0000 1.84
@@ -3,12 +3,12 @@
# "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
-%define buildforkernels newest
+%define buildforkernels current
Name: nvidia-173xx-kmod
-Version: 173.14.35
+Version: 173.14.36
# Taken over by kmodtool
-Release: 2%{?dist}.17
+Release: 1%{?dist}
Summary: NVIDIA 173xx display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -23,7 +23,7 @@
# </switch me>
#http://www.nvnews.net/vbulletin/attachment.php?attachmentid=32570&d=1218222727
-Patch0: 3.6_kernel.patch
+Patch0: 3.7_kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -95,6 +95,10 @@
%changelog
+* Sat Jan 19 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 173.14.36-1
+- Update to 173.14.36
+- patch for 3.7 kernel
+
* Thu Jan 17 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.35-2.17
- Rebuilt for updated kernel
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-173xx-kmod/F-17/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 5 Jun 2012 21:25:27 -0000 1.12
+++ sources 19 Jan 2013 23:05:29 -0000 1.13
@@ -1 +1 @@
-7f7637fdf254d906e2a677cbb8622428 nvidia-kmod-data-173.14.35.tar.bz2
+64bddf592e61efb23d6a65be0bd0e661 nvidia-kmod-data-173.14.36.tar.bz2
--- 3.6_kernel.patch DELETED ---