← Back to branch summary

~ubuntu-branches/ubuntu/natty/nvidia-graphics-drivers-96/natty

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Alberto Milone
  • Date: 2010-01-08 23:34:51 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20100108233451-f1142o5r7z0ou4o0
Tags: 96.43.14-0ubuntu1
https://launchpad.net/bugs/474917
https://launchpad.net/bugs/494166
* Rework packaging taking Mandriva's as a model:
  - Use alternatives instead of diversions.
  - Reduce the number of binary packages to nvidia-96,
    nvidia-96-dev and nvidia-96-modaliases.
* debian/rules:
  - Switch to CDBS.
  - Remove libGL.la as no static library is provided.
* debian/nvidia-current.README.Debian.in:
  - Document the update process.
* nvidia-current.postinst: try to build the module for the most
  recent kernel in addition to building it for the current kernel
  (LP: #474917).
* New upstream release (LP: #494166):
 - Add support for xserver 1.7.x.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian.binary/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