From 77e0137555a0a25dfa661f6ceecbaf1afe4e0aa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Fri, 17 Dec 2010 11:40:24 +0200
Subject: [PATCH] --- yaml --- r: 232591 b: refs/heads/master c:
 d70c673153d42e8aefd5ac296c8159ef222d076b h: refs/heads/master i:   232589:
 ee27ee2caf94e78063d1b68c41512e99341250af   232587:
 6c18981d3cbc52835bc576410db20584c02908f7   232583:
 7e25c67894bd31aabe7e0c4ddd14656f819fd2d5   232575:
 e24fe51527f732d6ebfd18d42352807ea0e1338c v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/staging/hv/netvsc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ca8d10e43939..83e4b398e32a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 268eff909afaca93188d2d14554cbf824f6a0e41
+refs/heads/master: d70c673153d42e8aefd5ac296c8159ef222d076b
diff --git a/trunk/drivers/staging/hv/netvsc.c b/trunk/drivers/staging/hv/netvsc.c
index df9cd131e953..0edbe7483a4c 100644
--- a/trunk/drivers/staging/hv/netvsc.c
+++ b/trunk/drivers/staging/hv/netvsc.c
@@ -1279,7 +1279,7 @@ static void netvsc_channel_cb(void *context)
 	/* ASSERT(device); */
 
 	packet = kzalloc(NETVSC_PACKET_SIZE * sizeof(unsigned char),
-			 GFP_KERNEL);
+			 GFP_ATOMIC);
 	if (!packet)
 		return;
 	buffer = packet;