Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- --- a/nv-linux.h 2011-10-26 13:35:32.866579965 +0200
- +++ b/nv-linux.h 2011-10-26 13:35:47.265117607 +0200
- @@ -265,17 +265,17 @@
- #endif
- #endif
- -#if defined(CONFIG_PREEMPT_RT)
- -typedef atomic_spinlock_t nv_spinlock_t;
- -#define NV_SPIN_LOCK_INIT(lock) atomic_spin_lock_init(lock)
- -#define NV_SPIN_LOCK_IRQ(lock) atomic_spin_lock_irq(lock)
- -#define NV_SPIN_UNLOCK_IRQ(lock) atomic_spin_unlock_irq(lock)
- -#define NV_SPIN_LOCK_IRQSAVE(lock,flags) atomic_spin_lock_irqsave(lock,flags)
- +#if defined(CONFIG_PREEMPT_RT_FULL)
- +typedef raw_spinlock_t nv_spinlock_t;
- +#define NV_SPIN_LOCK_INIT(lock) raw_spin_lock_init(lock)
- +#define NV_SPIN_LOCK_IRQ(lock) raw_spin_lock_irq(lock)
- +#define NV_SPIN_UNLOCK_IRQ(lock) raw_spin_unlock_irq(lock)
- +#define NV_SPIN_LOCK_IRQSAVE(lock,flags) raw_spin_lock_irqsave(lock,flags)
- #define NV_SPIN_UNLOCK_IRQRESTORE(lock,flags) \
- - atomic_spin_unlock_irqrestore(lock,flags)
- -#define NV_SPIN_LOCK(lock) atomic_spin_lock(lock)
- -#define NV_SPIN_UNLOCK(lock) atomic_spin_unlock(lock)
- -#define NV_SPIN_UNLOCK_WAIT(lock) atomic_spin_unlock_wait(lock)
- + raw_spin_unlock_irqrestore(lock,flags)
- +#define NV_SPIN_LOCK(lock) raw_spin_lock(lock)
- +#define NV_SPIN_UNLOCK(lock) raw_spin_unlock(lock)
- +#define NV_SPIN_UNLOCK_WAIT(lock) raw_spin_unlock_wait(lock)
- #else
- typedef spinlock_t nv_spinlock_t;
- #define NV_SPIN_LOCK_INIT(lock) spin_lock_init(lock)
- @@ -852,8 +852,8 @@
- return ret;
- }
- -#if defined(CONFIG_PREEMPT_RT)
- -#define NV_INIT_MUTEX(mutex) semaphore_init(mutex)
- +#if defined(CONFIG_PREEMPT_RT_FULL)
- +#define NV_INIT_MUTEX(mutex) sema_init(mutex,1)
- #else
- #if !defined(__SEMAPHORE_INITIALIZER) && defined(__COMPAT_SEMAPHORE_INITIALIZER)
- #define __SEMAPHORE_INITIALIZER __COMPAT_SEMAPHORE_INITIALIZER
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement