diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/rtmutex.h | 6 | ||||
| -rw-r--r-- | include/linux/seqlock.h | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/include/linux/rtmutex.h b/include/linux/rtmutex.h index 3aed8d737e1a..1abba5ce2a2f 100644 --- a/include/linux/rtmutex.h +++ b/include/linux/rtmutex.h | |||
| @@ -90,11 +90,9 @@ extern void __rt_mutex_init(struct rt_mutex *lock, const char *name); | |||
| 90 | extern void rt_mutex_destroy(struct rt_mutex *lock); | 90 | extern void rt_mutex_destroy(struct rt_mutex *lock); |
| 91 | 91 | ||
| 92 | extern void rt_mutex_lock(struct rt_mutex *lock); | 92 | extern void rt_mutex_lock(struct rt_mutex *lock); |
| 93 | extern int rt_mutex_lock_interruptible(struct rt_mutex *lock, | 93 | extern int rt_mutex_lock_interruptible(struct rt_mutex *lock); |
| 94 | int detect_deadlock); | ||
| 95 | extern int rt_mutex_timed_lock(struct rt_mutex *lock, | 94 | extern int rt_mutex_timed_lock(struct rt_mutex *lock, |
| 96 | struct hrtimer_sleeper *timeout, | 95 | struct hrtimer_sleeper *timeout); |
| 97 | int detect_deadlock); | ||
| 98 | 96 | ||
| 99 | extern int rt_mutex_trylock(struct rt_mutex *lock); | 97 | extern int rt_mutex_trylock(struct rt_mutex *lock); |
| 100 | 98 | ||
diff --git a/include/linux/seqlock.h b/include/linux/seqlock.h index 535f158977b9..8cf350325dc6 100644 --- a/include/linux/seqlock.h +++ b/include/linux/seqlock.h | |||
| @@ -164,8 +164,6 @@ static inline unsigned read_seqcount_begin(const seqcount_t *s) | |||
| 164 | static inline unsigned raw_seqcount_begin(const seqcount_t *s) | 164 | static inline unsigned raw_seqcount_begin(const seqcount_t *s) |
| 165 | { | 165 | { |
| 166 | unsigned ret = ACCESS_ONCE(s->sequence); | 166 | unsigned ret = ACCESS_ONCE(s->sequence); |
| 167 | |||
| 168 | seqcount_lockdep_reader_access(s); | ||
| 169 | smp_rmb(); | 167 | smp_rmb(); |
| 170 | return ret & ~1; | 168 | return ret & ~1; |
| 171 | } | 169 | } |
