From patchwork Mon Sep 22 21:50:42 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [7/8] hci_usb: replace mb with smp_mb Date: Mon, 22 Sep 2008 11:50:42 -0000 From: Andrew Morton X-Patchwork-Id: 970 Message-Id: <200809222150.m8MLog27031875@imap1.linux-foundation.org> To: davem@davemloft.net Cc: netdev@vger.kernel.org, akpm@linux-foundation.org, tom.leiming@gmail.com, hidave.darkstar@gmail.com, marcel@holtmann.org From: Ming Lei smp_mb is enough for ordering memory operations among processors,and mb is more expensive than smp_mb for UP machine, so replace it with smp_mb(). Signed-off-by: Ming Lei Acked-by: Marcel Holtmann Cc: Dave Young Signed-off-by: Andrew Morton --- drivers/bluetooth/hci_usb.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff -puN drivers/bluetooth/hci_usb.h~hci_usb-replace-mb-with-smp_mb drivers/bluetooth/hci_usb.h --- a/drivers/bluetooth/hci_usb.h~hci_usb-replace-mb-with-smp_mb +++ a/drivers/bluetooth/hci_usb.h @@ -70,8 +70,8 @@ static inline void _urb_queue_head(struc { unsigned long flags; spin_lock_irqsave(&q->lock, flags); - /* _urb_unlink needs to know which spinlock to use, thus mb(). */ - _urb->queue = q; mb(); list_add(&_urb->list, &q->head); + /* _urb_unlink needs to know which spinlock to use, thus smp_mb(). */ + _urb->queue = q; smp_mb(); list_add(&_urb->list, &q->head); spin_unlock_irqrestore(&q->lock, flags); } @@ -79,8 +79,8 @@ static inline void _urb_queue_tail(struc { unsigned long flags; spin_lock_irqsave(&q->lock, flags); - /* _urb_unlink needs to know which spinlock to use, thus mb(). */ - _urb->queue = q; mb(); list_add_tail(&_urb->list, &q->head); + /* _urb_unlink needs to know which spinlock to use, thus smp_mb(). */ + _urb->queue = q; smp_mb(); list_add_tail(&_urb->list, &q->head); spin_unlock_irqrestore(&q->lock, flags); } @@ -89,7 +89,7 @@ static inline void _urb_unlink(struct _u struct _urb_queue *q; unsigned long flags; - mb(); + smp_mb(); q = _urb->queue; /* If q is NULL, it will die at easy-to-debug NULL pointer dereference. No need to BUG(). */