Advertisement
Guest User

nvidia-rt 302.11

a guest
Jun 5th, 2012
141
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.82 KB | None | 0 0
  1. --- a/nv-linux.h 2011-10-26 13:35:32.866579965 +0200
  2. +++ b/nv-linux.h 2011-10-26 13:35:47.265117607 +0200
  3. @@ -265,17 +265,17 @@
  4. #endif
  5. #endif
  6.  
  7. -#if defined(CONFIG_PREEMPT_RT)
  8. -typedef atomic_spinlock_t nv_spinlock_t;
  9. -#define NV_SPIN_LOCK_INIT(lock) atomic_spin_lock_init(lock)
  10. -#define NV_SPIN_LOCK_IRQ(lock) atomic_spin_lock_irq(lock)
  11. -#define NV_SPIN_UNLOCK_IRQ(lock) atomic_spin_unlock_irq(lock)
  12. -#define NV_SPIN_LOCK_IRQSAVE(lock,flags) atomic_spin_lock_irqsave(lock,flags)
  13. +#if defined(CONFIG_PREEMPT_RT_FULL)
  14. +typedef raw_spinlock_t nv_spinlock_t;
  15. +#define NV_SPIN_LOCK_INIT(lock) raw_spin_lock_init(lock)
  16. +#define NV_SPIN_LOCK_IRQ(lock) raw_spin_lock_irq(lock)
  17. +#define NV_SPIN_UNLOCK_IRQ(lock) raw_spin_unlock_irq(lock)
  18. +#define NV_SPIN_LOCK_IRQSAVE(lock,flags) raw_spin_lock_irqsave(lock,flags)
  19. #define NV_SPIN_UNLOCK_IRQRESTORE(lock,flags) \
  20. - atomic_spin_unlock_irqrestore(lock,flags)
  21. -#define NV_SPIN_LOCK(lock) atomic_spin_lock(lock)
  22. -#define NV_SPIN_UNLOCK(lock) atomic_spin_unlock(lock)
  23. -#define NV_SPIN_UNLOCK_WAIT(lock) atomic_spin_unlock_wait(lock)
  24. + raw_spin_unlock_irqrestore(lock,flags)
  25. +#define NV_SPIN_LOCK(lock) raw_spin_lock(lock)
  26. +#define NV_SPIN_UNLOCK(lock) raw_spin_unlock(lock)
  27. +#define NV_SPIN_UNLOCK_WAIT(lock) raw_spin_unlock_wait(lock)
  28. #else
  29. typedef spinlock_t nv_spinlock_t;
  30. #define NV_SPIN_LOCK_INIT(lock) spin_lock_init(lock)
  31. @@ -852,8 +852,8 @@
  32. return ret;
  33. }
  34.  
  35. -#if defined(CONFIG_PREEMPT_RT)
  36. -#define NV_INIT_MUTEX(mutex) semaphore_init(mutex)
  37. +#if defined(CONFIG_PREEMPT_RT_FULL)
  38. +#define NV_INIT_MUTEX(mutex) sema_init(mutex,1)
  39. #else
  40. #if !defined(__SEMAPHORE_INITIALIZER) && defined(__COMPAT_SEMAPHORE_INITIALIZER)
  41. #define __SEMAPHORE_INITIALIZER __COMPAT_SEMAPHORE_INITIALIZER
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement