From e4c057a3b2c1bde92d1375db698c0be8a9df6b71 Mon Sep 17 00:00:00 2001
From: David Sterba <dsterba@suse.cz>
Date: Tue, 2 Nov 2010 23:47:18 +0100
Subject: [PATCH] --- yaml --- r: 221935 b: refs/heads/master c:
 ef821ae70fc35a76bdce7e07c70a1a7c2c33cdb9 h: refs/heads/master i:   221933:
 9bdcd3a4797af21f6e1963cf8fc9ba793739d1e4   221931:
 ba338b6ed96e7e8f366dd22a469eb69fb29b64a9   221927:
 8cab843cc5394c0f14be484095ef798978e6e7af   221919:
 20ae42954b55429fa6a3d1be0ed632f1e983926f v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/usb/host/xhci.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 55dac226646e..d84c3bae1c59 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b4cd731b08fd7fa2f370a5b329062fb5006dc24
+refs/heads/master: ef821ae70fc35a76bdce7e07c70a1a7c2c33cdb9
diff --git a/trunk/drivers/usb/host/xhci.c b/trunk/drivers/usb/host/xhci.c
index 5d7d4e951ea4..8ddc965718ab 100644
--- a/trunk/drivers/usb/host/xhci.c
+++ b/trunk/drivers/usb/host/xhci.c
@@ -240,7 +240,7 @@ static int xhci_setup_msix(struct xhci_hcd *xhci)
 
 	xhci->msix_entries =
 		kmalloc((sizeof(struct msix_entry))*xhci->msix_count,
-				GFP_KERNEL);
+				GFP_ATOMIC);
 	if (!xhci->msix_entries) {
 		xhci_err(xhci, "Failed to allocate MSI-X entries\n");
 		return -ENOMEM;