xf86-video-nvidia: update patches

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2013-05-13 21:56:39 +02:00
parent 76794512f4
commit 535c7f9fba
2 changed files with 3 additions and 60 deletions

View File

@ -1,46 +0,0 @@
From 1e3d34ce7d8c4912c08386589843fcc4ba4d38bf Mon Sep 17 00:00:00 2001
From: Alberto Milone <alberto.milone@canonical.com>
Date: Wed, 7 Nov 2012 12:03:46 +0100
Subject: [PATCH 1/2] Make use of the new uapi framework
---
conftest.sh | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/kernel/conftest.sh b/kernel/conftest.sh
index 388e268..8eff4d7 100755
--- a/kernel/conftest.sh
+++ b/kernel/conftest.sh
@@ -20,6 +20,7 @@ ARCH=$3
ISYSTEM=`$CC -print-file-name=include 2> /dev/null`
SOURCES=$4
HEADERS=$SOURCES/include
+HEADERSA=$SOURCES/include/uapi
OUTPUT=$5
XEN_PRESENT=1
@@ -118,7 +119,7 @@ build_cflags() {
fi
fi
- CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
+ CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
test_xen
@@ -146,10 +147,10 @@ build_cflags() {
fi
fi
- CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
+ CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
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 -I$SOURCES/arch/x86/include/uapi -I$OUTPUT/arch/x86/include/generated -I$OUTPUT/arch/x86/include/generated/uapi"
elif [ "$ARCH" = "arm" ]; then
CFLAGS="$CFLAGS -I$SOURCES/arch/arm/include -I$OUTPUT/arch/arm/include/generated"
fi
--
1.7.9.5

View File

@ -1,14 +1,5 @@
From fed1fa17202cf13bf80bbbad3bf0ffdfd192df42 Mon Sep 17 00:00:00 2001
From: Alberto Milone <alberto.milone@canonical.com>
Date: Wed, 7 Nov 2012 12:11:02 +0100
Subject: [PATCH 1/1] Replace VM_RESERVED with VM_DONTEXPAND and VM_DONTDUMP
---
nv-mmap.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/kernel/nv-mmap.c b/kernel/nv-mmap.c
index acc02ec..b2d5cdb 100644
index 178c6b7..b969bfd 100644
--- a/kernel/nv-mmap.c
+++ b/kernel/nv-mmap.c
@@ -463,7 +463,11 @@ int nv_kern_mmap(
@ -20,9 +11,7 @@ index acc02ec..b2d5cdb 100644
+#else
vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED);
+#endif
vma->vm_flags |= (VM_DONTEXPAND | VM_DONTDUMP);
}
#if defined(VM_DRIVER_PAGES)
vma->vm_flags |= VM_DRIVER_PAGES;
--
1.7.9.5