← Back to branch summary

~computersforpeace/ubuntu/utopic/nvidia-graphics-drivers-331/fix-for-1367468

« back to all changes in this revision

Viewing changes to debian/dkms_nvidia/patches/buildfix_kernel_3.13.patch

  • Committer: Package Import Robot
  • Author(s): Alberto Milone
  • Date: 2014-01-08 14:58:56 UTC
  • Revision ID: package-import@ubuntu.com-20140108145856-vqcjzqhy4vi87bal
Tags: 331.20-0ubuntu8
* debian/templates/nvidia-graphics-drivers-uvm.install.in,
  debian/templates/dkms_nvidia_uvm.conf,
  debian/dkms_nvidia_uvm/patches/buildfix_kernel_3.12.patch:
  - Add support for Linux 3.12.
* debian/templates/dkms_nvidia.conf.in,
  debian/dkms_nvidia/patches/buildfix_kernel_3.13.patch:
  - Add support for Linux 3.13.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/dkms_nvidia/patches/buildfix_kernel_3.13.patch
 
1
From eeaf016b820182d911ea4a4e7cb6651928300599 Mon Sep 17 00:00:00 2001
 
2
From: Alberto Milone <alberto.milone@canonical.com>
 
3
Date: Tue, 7 Jan 2014 15:30:30 +0100
 
4
Subject: [PATCH 1/2] nv-acpi.c: add support for Linux 3.13
 
5
 
 
6
There's no need to call acpi_os_wait_events_complete() (or its
 
7
NVIDIA equivalent) as, in 3.13, acpi_remove_notify_handler() waits
 
8
for events to finish.
 
9
---
 
10
 nv-acpi.c |    2 ++
 
11
 1 file changed, 2 insertions(+)
 
12
 
 
13
diff --git a/nv-acpi.c b/nv-acpi.c
 
14
index b0138cd..022950b 100644
 
15
--- a/nv-acpi.c
 
16
+++ b/nv-acpi.c
 
17
@@ -303,7 +303,9 @@ static int nv_acpi_remove(struct acpi_device *device, int type)
 
18
 
 
19
     if (pNvAcpiObject->notify_handler_installed)
 
20
     {
 
21
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
 
22
         NV_ACPI_OS_WAIT_EVENTS_COMPLETE();
 
23
+#endif
 
24
 
 
25
         // remove event notifier
 
26
         status = acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY, nv_acpi_event);
 
27
-- 
 
28
1.7.9.5
 
29