diff options
author | Peter Zijlstra <peterz@infradead.org> | 2014-03-17 13:06:10 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-04-18 08:20:48 -0400 |
commit | 4e857c58efeb99393cba5a5d0d8ec7117183137c (patch) | |
tree | 3f6fd464e4fddb2fe90374c075c9d06603cf8bbc /net/bluetooth/hci_event.c | |
parent | 1b15611e1c30b37abe393d411c316cd659920bf5 (diff) |
arch: Mass conversion of smp_mb__*()
Mostly scripted conversion of the smp_mb__* barriers.
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/n/tip-55dhyhocezdw1dg7u19hmh1u@git.kernel.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-arch@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/bluetooth/hci_event.c')
-rw-r--r-- | net/bluetooth/hci_event.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 49774912cb01..74014420b3c7 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c | |||
@@ -45,7 +45,7 @@ static void hci_cc_inquiry_cancel(struct hci_dev *hdev, struct sk_buff *skb) | |||
45 | return; | 45 | return; |
46 | 46 | ||
47 | clear_bit(HCI_INQUIRY, &hdev->flags); | 47 | clear_bit(HCI_INQUIRY, &hdev->flags); |
48 | smp_mb__after_clear_bit(); /* wake_up_bit advises about this barrier */ | 48 | smp_mb__after_atomic(); /* wake_up_bit advises about this barrier */ |
49 | wake_up_bit(&hdev->flags, HCI_INQUIRY); | 49 | wake_up_bit(&hdev->flags, HCI_INQUIRY); |
50 | 50 | ||
51 | hci_conn_check_pending(hdev); | 51 | hci_conn_check_pending(hdev); |
@@ -1768,7 +1768,7 @@ static void hci_inquiry_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) | |||
1768 | if (!test_and_clear_bit(HCI_INQUIRY, &hdev->flags)) | 1768 | if (!test_and_clear_bit(HCI_INQUIRY, &hdev->flags)) |
1769 | return; | 1769 | return; |
1770 | 1770 | ||
1771 | smp_mb__after_clear_bit(); /* wake_up_bit advises about this barrier */ | 1771 | smp_mb__after_atomic(); /* wake_up_bit advises about this barrier */ |
1772 | wake_up_bit(&hdev->flags, HCI_INQUIRY); | 1772 | wake_up_bit(&hdev->flags, HCI_INQUIRY); |
1773 | 1773 | ||
1774 | if (!test_bit(HCI_MGMT, &hdev->dev_flags)) | 1774 | if (!test_bit(HCI_MGMT, &hdev->dev_flags)) |