334.16 won't compile for Linux v3.13 (patch included)

[leigh123linux]

@ExecutorElassus

I, however, cannot get this patch to work. Here’s the output from the log:

***** nvidia-334.16-linux-3.13.patch *****
PWD: /var/tmp/portage/x11-drivers/nvidia-drivers-334.16-r3/work

==========================================

PATCH COMMAND:  patch -p0 -g0 -E --no-backup-if-mismatch  < '/etc/portage/patches//x11-drivers/nvidia-drivers-334.16/nvidia-334.16-linux-3.13.patch'

==========================================
(Patch is indented 4 spaces.)
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|    --- a/kernel/nv-acpi.c
|    +++ b/kernel/nv-acpi.c
--------------------------
No file to patch.  Skipping patch.
patch: **** malformed patch at line 12: static RM_STATUS nv_acpi_extract_integer (const union acpi_object *, void *, NvU32, NvU32 *);

patch program exited with status 2

Please do let me know whatever dumb thing it was I did that led to this unfortunate situation (PS, I’m kinda stoopid with kernel-patching). I’m using the patch provided by #4.

BFF,

EE
PS- d’oh, I am indeed kinda stoopid. #4 was not a complete patch. the patch in #1, with the last bit deleted, compiles fine, and seems to run without problems. <3

The patch in post#4 is complete, theirs are longer because they patch each “ACPI_HANDLE” statement instead of redefining it.

+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0) && defined(ACPI_HANDLE)
+#define DEVICE_ACPI_HANDLE(a) ACPI_HANDLE(a)
+#endif
+

As for it failing perhaps you used the wrong patch level (I use -p1 here).

--- kernel/nv-acpi.c
+++ kernel/nv-acpi.c
@@ -15,6 +15,10 @@
 #include "nv-linux.h"
 #include "nv-reg.h"
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0) && defined(ACPI_HANDLE)
+#define DEVICE_ACPI_HANDLE(a) ACPI_HANDLE(a)
+#endif
+
 #if defined(NV_LINUX_ACPI_EVENTS_SUPPORTED)
 static RM_STATUS   nv_acpi_extract_integer (const union acpi_object *, void *, NvU32, NvU32 *);
 static RM_STATUS   nv_acpi_extract_buffer  (const union acpi_object *, void *, NvU32, NvU32 *);
@@ -303,7 +307,10 @@ static int nv_acpi_remove(struct acpi_de
 
     if (pNvAcpiObject->notify_handler_installed)
     {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
+ /* beginning with 3.13, acpi_remove_notify_handler() waits for events to finish */
         NV_ACPI_OS_WAIT_EVENTS_COMPLETE();
+#endif
 
         // remove event notifier
         status = acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY, nv_acpi_event);

To apply with the nvidia patch utility

./NVIDIA-Linux-x86_64-334.16.run --apply-patch nvidia_3.14_kernel.patch