Author: leigh123linux Update of /cvs/nonfree/rpms/nvidia-173xx-kmod/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11256 Modified Files: nvidia-173xx-kmod.spec Added Files: 3.7_kernel.patch Removed Files: 3.6_kernel.patch Log Message: * Tue Jan 08 2013 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 173.14.36-2 - patched and rebuilt 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-18/nvidia-173xx-kmod.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- nvidia-173xx-kmod.spec 3 Jan 2013 22:49:48 -0000 1.51 +++ nvidia-173xx-kmod.spec 8 Jan 2013 14:09:38 -0000 1.52 @@ -8,7 +8,7 @@ Name: nvidia-173xx-kmod Version: 173.14.36 # Taken over by kmodtool -Release: 1%{?dist}.4 +Release: 2%{?dist} Summary: NVIDIA 173xx display driver kernel module Group: System Environment/Kernel License: Redistributable, no modification permitted @@ -22,6 +22,7 @@ #Source0: http://www.diffingo.com/downloads/livna/kmod-data/nvidia-kmod-data-%{vers... # </switch me> #http://www.nvnews.net/vbulletin/attachment.php?attachmentid=32570&d=1218222727 +Patch0: 3.7_kernel.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -49,7 +50,7 @@ for arch in x86 x64 do pushd nvidiapkg-${arch} -echo "no patch to apply" +%patch0 -p1 popd done @@ -93,6 +94,9 @@ %changelog +* Tue Jan 08 2013 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 173.14.36-2 +- patched and rebuilt for 3.7 kernel + * Thu Jan 03 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.36-1.4 - Rebuilt for f18 final kernel --- 3.6_kernel.patch DELETED ---