Well, this is really a temporary workaround for people who like to
run the latest git kernel from Linus, and it's only tested for
nvidia-drivers-302.17-r1, and only on ~amd_64.


diff -ur NVIDIA-Linux-x86_64-302.17.orig/kernel/conftest.sh NVIDIA-Linux-x86_64-302.17/kernel/conftest.sh
--- NVIDIA-Linux-x86_64-302.17.orig/kernel/conftest.sh	2012-06-12 16:03:27.000000000 -0700
+++ NVIDIA-Linux-x86_64-302.17/kernel/conftest.sh	2012-10-15 08:12:56.594959000 -0700
@@ -126,7 +126,7 @@
     CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $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$OUTPUT/arch/x86/include/generated -I$SOURCES/include/uapi"
     elif [ "$ARCH" = "arm" ]; then
         CFLAGS="$CFLAGS -I$SOURCES/arch/arm/include -I$OUTPUT/arch/arm/include/generated"
     fi
diff -ur NVIDIA-Linux-x86_64-302.17.orig/kernel/nv-acpi.c NVIDIA-Linux-x86_64-302.17/kernel/nv-acpi.c
--- NVIDIA-Linux-x86_64-302.17.orig/kernel/nv-acpi.c	2012-06-12 16:03:27.000000000 -0700
+++ NVIDIA-Linux-x86_64-302.17/kernel/nv-acpi.c	2012-10-15 08:15:15.888959000 -0700
@@ -300,7 +300,7 @@
     if (pNvAcpiObject->notify_handler_installed)
     {
         // no status returned for this function
-        acpi_os_wait_events_complete(NULL);
+        acpi_os_wait_events_complete();
 
         // remove event notifier
         status = acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY, nv_acpi_event);
diff -ur NVIDIA-Linux-x86_64-302.17.orig/kernel/nv-mmap.c NVIDIA-Linux-x86_64-302.17/kernel/nv-mmap.c
--- NVIDIA-Linux-x86_64-302.17.orig/kernel/nv-mmap.c	2012-06-12 16:03:27.000000000 -0700
+++ NVIDIA-Linux-x86_64-302.17/kernel/nv-mmap.c	2012-10-15 08:17:13.084959000 -0700
@@ -450,7 +450,7 @@
         NV_PRINT_AT(NV_DBG_MEMINFO, at);
         nv_vm_list_page_count(&at->page_table[i], pages);
 
-        vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED);
+        vma->vm_flags |= (VM_IO | VM_LOCKED | VM_IO);
 
 #if defined(VM_DRIVER_PAGES)
         vma->vm_flags |= VM_DRIVER_PAGES;

Reply via email to