diff options
| author | wangweidong <wangweidong1@huawei.com> | 2014-01-21 02:44:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-21 21:40:40 -0500 |
| commit | 940287ee10e270b78fbda6c44eaa1def5fde897d (patch) | |
| tree | b171d0c490547693d693d1af677d8e39912ea848 | |
| parent | d08f161a10006491d5835702bff2a12c91fb0cdd (diff) | |
sctp: remove macros sctp_spin_[un]lock_irqrestore
Redefined spin_[un]lock_irqstore to sctp_spin_[un]lock_irqrestore for user
space friendly code which we haven't use in years, so removing them.
Signed-off-by: Wang Weidong <wangweidong1@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/sctp/sctp.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h index 610a8c8738fa..b180a8fb68c5 100644 --- a/include/net/sctp/sctp.h +++ b/include/net/sctp/sctp.h | |||
| @@ -171,9 +171,6 @@ extern struct kmem_cache *sctp_bucket_cachep __read_mostly; | |||
| 171 | */ | 171 | */ |
| 172 | 172 | ||
| 173 | /* spin lock wrappers. */ | 173 | /* spin lock wrappers. */ |
| 174 | #define sctp_spin_lock_irqsave(lock, flags) spin_lock_irqsave(lock, flags) | ||
| 175 | #define sctp_spin_unlock_irqrestore(lock, flags) \ | ||
| 176 | spin_unlock_irqrestore(lock, flags) | ||
| 177 | #define sctp_local_bh_disable() local_bh_disable() | 174 | #define sctp_local_bh_disable() local_bh_disable() |
| 178 | #define sctp_local_bh_enable() local_bh_enable() | 175 | #define sctp_local_bh_enable() local_bh_enable() |
| 179 | #define sctp_spin_lock(lock) spin_lock(lock) | 176 | #define sctp_spin_lock(lock) spin_lock(lock) |
| @@ -353,13 +350,13 @@ static inline void sctp_skb_list_tail(struct sk_buff_head *list, | |||
| 353 | { | 350 | { |
| 354 | unsigned long flags; | 351 | unsigned long flags; |
| 355 | 352 | ||
| 356 | sctp_spin_lock_irqsave(&head->lock, flags); | 353 | spin_lock_irqsave(&head->lock, flags); |
| 357 | sctp_spin_lock(&list->lock); | 354 | sctp_spin_lock(&list->lock); |
| 358 | 355 | ||
| 359 | skb_queue_splice_tail_init(list, head); | 356 | skb_queue_splice_tail_init(list, head); |
| 360 | 357 | ||
| 361 | sctp_spin_unlock(&list->lock); | 358 | sctp_spin_unlock(&list->lock); |
| 362 | sctp_spin_unlock_irqrestore(&head->lock, flags); | 359 | spin_unlock_irqrestore(&head->lock, flags); |
| 363 | } | 360 | } |
| 364 | 361 | ||
| 365 | /** | 362 | /** |
