diff options
| author |   José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-11 10:41:07 +0300 |
|---|---|---|
| committer | José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-13 08:17:18 +0300 |
| commit | e09b41010ba33a20a87472ee821fa407a5b8da36 (patch) | |
| tree | d10dc367189862e7ca5c592f033dc3726e1df4e3 /kernel/include/linux/rwsem_rt.h | |
| parent | f93b97fd65072de626c074dbe099a1fff05ce060 (diff) | |
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
are taken from kernel.org, and rt patch from the rt wiki download page.
During the rebasing, the following patch collided:
Force tick interrupt and get rid of softirq magic(I70131fb85).
Collisions have been removed because its logic was found on the
source already.
Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769
Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'kernel/include/linux/rwsem_rt.h')
| -rw-r--r-- | kernel/include/linux/rwsem_rt.h | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/kernel/include/linux/rwsem_rt.h b/kernel/include/linux/rwsem_rt.h index 928a05cbf..f97860b2e 100644 --- a/kernel/include/linux/rwsem_rt.h +++ b/kernel/include/linux/rwsem_rt.h @@ -51,18 +51,20 @@ do { \ __rt_init_rwsem((sem), #sem, &__key); \ } while (0) -extern void rt_down_write(struct rw_semaphore *rwsem); +extern void rt_down_write(struct rw_semaphore *rwsem); extern void rt_down_read_nested(struct rw_semaphore *rwsem, int subclass); extern void rt_down_write_nested(struct rw_semaphore *rwsem, int subclass); extern void rt_down_write_nested_lock(struct rw_semaphore *rwsem, - struct lockdep_map *nest); -extern void rt_down_read(struct rw_semaphore *rwsem); + struct lockdep_map *nest); +extern void rt__down_read(struct rw_semaphore *rwsem); +extern void rt_down_read(struct rw_semaphore *rwsem); extern int rt_down_write_trylock(struct rw_semaphore *rwsem); +extern int rt__down_read_trylock(struct rw_semaphore *rwsem); extern int rt_down_read_trylock(struct rw_semaphore *rwsem); -extern void __rt_up_read(struct rw_semaphore *rwsem); -extern void rt_up_read(struct rw_semaphore *rwsem); -extern void rt_up_write(struct rw_semaphore *rwsem); -extern void rt_downgrade_write(struct rw_semaphore *rwsem); +extern void __rt_up_read(struct rw_semaphore *rwsem); +extern void rt_up_read(struct rw_semaphore *rwsem); +extern void rt_up_write(struct rw_semaphore *rwsem); +extern void rt_downgrade_write(struct rw_semaphore *rwsem); #define init_rwsem(sem) rt_init_rwsem(sem) #define rwsem_is_locked(s) rt_mutex_is_locked(&(s)->lock) @@ -73,11 +75,21 @@ static inline int rwsem_is_contended(struct rw_semaphore *sem) return !RB_EMPTY_ROOT(&sem->lock.waiters); } +static inline void __down_read(struct rw_semaphore *sem) +{ + rt__down_read(sem); +} + static inline void down_read(struct rw_semaphore *sem) { rt_down_read(sem); } +static inline int __down_read_trylock(struct rw_semaphore *sem) +{ + return rt__down_read_trylock(sem); +} + static inline int down_read_trylock(struct rw_semaphore *sem) { return rt_down_read_trylock(sem); |