nvidia-rt/nvidiart.patch

   1 ---
   2  kernel/nv-linux.h |   20 ++++++++++----------
   3  1 files changed, 10 insertions(+), 10 deletions(-)
   4
   5 diff --git a/kernel/nv-linux.h b/kernel/nv-linux.h
   6 index 3ba43e7..e95460a 100644
   7 --- a/kernel/nv-linux.h
   8 +++ b/kernel/nv-linux.h
   9 @@ -218,16 +218,16 @@ extern int nv_pat_mode;
  10  #endif
  11
  12  #if defined(CONFIG_PREEMPT_RT)
  13 -typedef atomic_spinlock_t         nv_spinlock_t;
  14 -#define NV_SPIN_LOCK_INIT(lock)   atomic_spin_lock_init(lock)
  15 -#define NV_SPIN_LOCK_IRQ(lock)    atomic_spin_lock_irq(lock)
  16 -#define NV_SPIN_UNLOCK_IRQ(lock)  atomic_spin_unlock_irq(lock)
  17 -#define NV_SPIN_LOCK_IRQSAVE(lock,flags) atomic_spin_lock_irqsave(lock,flags)
  18 +typedef raw_spinlock_t         nv_spinlock_t;
  19 +#define NV_SPIN_LOCK_INIT(lock)   raw_spin_lock_init(lock)
  20 +#define NV_SPIN_LOCK_IRQ(lock)    raw_spin_lock_irq(lock)
  21 +#define NV_SPIN_UNLOCK_IRQ(lock)  raw_spin_unlock_irq(lock)
  22 +#define NV_SPIN_LOCK_IRQSAVE(lock,flags) raw_spin_lock_irqsave(lock,flags)
  23  #define NV_SPIN_UNLOCK_IRQRESTORE(lock,flags) \
  24 -  atomic_spin_unlock_irqrestore(lock,flags)
  25 -#define NV_SPIN_LOCK(lock)        atomic_spin_lock(lock)
  26 -#define NV_SPIN_UNLOCK(lock)      atomic_spin_unlock(lock)
  27 -#define NV_SPIN_UNLOCK_WAIT(lock) atomic_spin_unlock_wait(lock)
  28 +  raw_spin_unlock_irqrestore(lock,flags)
  29 +#define NV_SPIN_LOCK(lock)        raw_spin_lock(lock)
  30 +#define NV_SPIN_UNLOCK(lock)      raw_spin_unlock(lock)
  31 +#define NV_SPIN_UNLOCK_WAIT(lock) raw_spin_unlock_wait(lock)
  32  #else
  33  typedef spinlock_t                nv_spinlock_t;
  34  #define NV_SPIN_LOCK_INIT(lock)   spin_lock_init(lock)
  35 @@ -791,7 +791,7 @@ static inline int nv_execute_on_all_cpus(void (*func)(void *info), void *info)
  36  }
  37
  38  #if defined(CONFIG_PREEMPT_RT)
  39 -#define NV_INIT_MUTEX(mutex) semaphore_init(mutex)
  40 +#define NV_INIT_MUTEX(mutex) sema_init(mutex,1)
  41  #else
  42  #if !defined(__SEMAPHORE_INITIALIZER) && defined(__COMPAT_SEMAPHORE_INITIALIZER)
  43  #define __SEMAPHORE_INITIALIZER __COMPAT_SEMAPHORE_INITIALIZER
  44 --