From: walt <w41ter@gmail.com>
To: gentoo-user@lists.gentoo.org
Subject: [gentoo-user] [PATCH] Linus breaks nvidia-drivers again
Date: Mon, 15 Oct 2012 09:05:27 -0700 [thread overview]
Message-ID: <k5hc7r$792$1@ger.gmane.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 179 bytes --]
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.
[-- Attachment #2: nvidia.patch --]
[-- Type: text/x-patch, Size: 1995 bytes --]
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;
next reply other threads:[~2012-10-15 16:07 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-15 16:05 walt [this message]
2012-10-15 17:30 ` [gentoo-user] Re: [PATCH] Linus breaks ati-drivers again walt
2012-10-15 17:33 ` [gentoo-user] Re: [PATCH] Linus breaks virtualbox-modules again walt
2012-10-15 18:10 ` [gentoo-user] [PATCH] Linus breaks nvidia-drivers again Walter Dnes
2012-10-15 18:19 ` pk
2012-10-15 18:59 ` Walter Dnes
2012-10-15 23:21 ` [gentoo-user] " walt
2012-10-16 7:30 ` microcai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='k5hc7r$792$1@ger.gmane.org' \
--to=w41ter@gmail.com \
--cc=gentoo-user@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox