← Back to branch summary

~ubuntu-branches/ubuntu/precise/nvidia-graphics-drivers-96/precise-updates

« back to all changes in this revision

Viewing changes to debian/dkms/patches/rt_preempt_31.patch

  • Committer: Bazaar Package Importer
  • Author(s): Alberto Milone
  • Date: 2011-08-01 16:18:40 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20110801161840-ez5hujv6nu98t8ax
Tags: 96.43.20-0ubuntu1
https://launchpad.net/bugs/741930
https://launchpad.net/bugs/798049
* New upstream release:
  - Fixed a bug that caused freezes and crashes when resizing
    windows in KDE 4 with desktop effects enabled using X.Org
    X server version 1.10 or later.
  - Added support for X.Org xserver 1.10 (LP: #741930).
* debian/control.in:
  - Drop transitional packages.
* debian/dkms.conf.in:
  - Prevent DKMS builds with kernels newer than the ones we ship.
* debian/dkms/patches:
  - Drop obsolete patches.
* debian/nvidia-96.postinst.in:
  - Add support for multi-arch (LP: #798049).
  - Remove slave link to nvidia-smi since the binary does not
    exist.
  - Remove any previous gl_conf alternative.
* debian/nvidia-96.README.Debian.in
  - Update the README with the DKMS OBSOLETE_BY option.
* debian/rules:
  - Do not hardcode the X ABI any more.
  - Install an empty ld.so.conf for the fake alternative
  - Remove obsolete instructions from debian/rules
  - Prevent the build from failing when no patches are available.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/dkms/patches/rt_preempt_31.patch
1
 
diff -urN NVIDIA-Linux-x86-185.18.36-pkg1/usr/src/nv/nv-linux.h NVIDIA-Linux-x86-185.18.36-pkg1.new/usr/src/nv/nv-linux.h
2
 
--- nvidia-185.18.36/nv-linux.h 2009-08-15 10:58:45.000000000 +1000
3
 
+++ nvidia-185.18.36.new/nv-linux.h     2009-09-26 21:43:35.000000000 +1000
4
 
@@ -721,7 +721,7 @@
5
 
 #define nv_up(lock)                     up(&lock)
6
 
 
7
 
 #if defined(CONFIG_PREEMPT_RT)
8
 
-#define NV_INIT_MUTEX(mutex) init_MUTEX(mutex)
9
 
+#define NV_INIT_MUTEX(mutex) semaphore_init(mutex)
10
 
 #else
11
 
 #if !defined(__SEMAPHORE_INITIALIZER) && defined(__COMPAT_SEMAPHORE_INITIALIZER)
12
 
 #define __SEMAPHORE_INITIALIZER __COMPAT_SEMAPHORE_INITIALIZER