diff --git a/[refs] b/[refs]
index 99b1db23b90a..ce3489f49ef8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d912bb7677f46d78a3cde8a4afd45a3fca4b34e9
+refs/heads/master: e7a2577a410a066ae409f805618f7e84748a537d
diff --git a/trunk/drivers/crypto/ixp4xx_crypto.c b/trunk/drivers/crypto/ixp4xx_crypto.c
index a82c11af9f48..0053d7ebb5ca 100644
--- a/trunk/drivers/crypto/ixp4xx_crypto.c
+++ b/trunk/drivers/crypto/ixp4xx_crypto.c
@@ -265,7 +265,7 @@ static int setup_crypt_desc(void)
 	BUILD_BUG_ON(sizeof(struct crypt_ctl) != 64);
 	crypt_virt = dma_alloc_coherent(dev,
 			NPE_QLEN * sizeof(struct crypt_ctl),
-			&crypt_phys, GFP_KERNEL);
+			&crypt_phys, GFP_ATOMIC);
 	if (!crypt_virt)
 		return -ENOMEM;
 	memset(crypt_virt, 0, NPE_QLEN * sizeof(struct crypt_ctl));