From a16f62d8cd584f714277921eaba11f4bb5cdfdaa Mon Sep 17 00:00:00 2001
From: Andre Guedes <aguedespe@gmail.com>
Date: Thu, 7 Jun 2012 19:05:44 -0300
Subject: [PATCH] --- yaml --- r: 315661 b: refs/heads/master c:
 92c4c2049762dc0ef2b152df8c787051db1cdf60 h: refs/heads/master i:   315659:
 a33cf30effee5f42307d8449fd3fa47a06623fdf v: v3

---
 [refs]                     | 2 +-
 trunk/net/bluetooth/mgmt.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7c7cce935636..3896109cdf23 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9345d40c580d0f3dfc040add0e6371b1a629c1cc
+refs/heads/master: 92c4c2049762dc0ef2b152df8c787051db1cdf60
diff --git a/trunk/net/bluetooth/mgmt.c b/trunk/net/bluetooth/mgmt.c
index eff610d5081a..86590c653232 100644
--- a/trunk/net/bluetooth/mgmt.c
+++ b/trunk/net/bluetooth/mgmt.c
@@ -1268,7 +1268,7 @@ static int add_uuid(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)
 		goto failed;
 	}
 
-	uuid = kmalloc(sizeof(*uuid), GFP_ATOMIC);
+	uuid = kmalloc(sizeof(*uuid), GFP_KERNEL);
 	if (!uuid) {
 		err = -ENOMEM;
 		goto failed;
@@ -1667,7 +1667,7 @@ static int get_connections(struct sock *sk, struct hci_dev *hdev, void *data,
 	}
 
 	rp_len = sizeof(*rp) + (i * sizeof(struct mgmt_addr_info));
-	rp = kmalloc(rp_len, GFP_ATOMIC);
+	rp = kmalloc(rp_len, GFP_KERNEL);
 	if (!rp) {
 		err = -ENOMEM;
 		goto unlock;