From ab1d9af48a085cdb7b178b4b032fa417e8163fd4 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 11 Nov 2010 09:41:02 -0800
Subject: [PATCH] --- yaml --- r: 221943 b: refs/heads/master c:
 868719752d60fb04a3714d77fdeb780b4d585faf h: refs/heads/master i:   221941:
 2c35715f584afd8f2ea479492d551e6ad655d0cd   221939:
 a95bb51e058e57189dab281f4c15e3b8eddd8d49   221935:
 e4c057a3b2c1bde92d1375db698c0be8a9df6b71 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 d14da474e48a..3955c87ada5b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c0a38038e8fcfaa6b5a81d53a4898f3f939f582
+refs/heads/master: 868719752d60fb04a3714d77fdeb780b4d585faf
diff --git a/trunk/drivers/usb/host/xhci.c b/trunk/drivers/usb/host/xhci.c
index 8ddc965718ab..5d7d4e951ea4 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_ATOMIC);
+				GFP_KERNEL);
 	if (!xhci->msix_entries) {
 		xhci_err(xhci, "Failed to allocate MSI-X entries\n");
 		return -ENOMEM;