From f26854e19500e6d71bc6d505b0c4e3dd869eb811 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Sun, 11 Dec 2011 23:42:53 +0000
Subject: [PATCH] --- yaml --- r: 276781 b: refs/heads/master c:
 3f1e6d3fd37bd4f25e5b19f1c7ca21850426c33f h: refs/heads/master i:   276779:
 61f73eb9acada4781fb40878b1077d54846b3dc7 v: v3

---
 [refs]                     | 2 +-
 trunk/net/sched/sch_gred.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f4cedc7e812d..b1ac777cf81c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72b36015ba43a3cca5303f5534d2c3e1899eae29
+refs/heads/master: 3f1e6d3fd37bd4f25e5b19f1c7ca21850426c33f
diff --git a/trunk/net/sched/sch_gred.c b/trunk/net/sched/sch_gred.c
index b9493a09a870..6cd8ddfb512d 100644
--- a/trunk/net/sched/sch_gred.c
+++ b/trunk/net/sched/sch_gred.c
@@ -385,7 +385,7 @@ static inline int gred_change_vq(struct Qdisc *sch, int dp,
 	struct gred_sched_data *q;
 
 	if (table->tab[dp] == NULL) {
-		table->tab[dp] = kzalloc(sizeof(*q), GFP_KERNEL);
+		table->tab[dp] = kzalloc(sizeof(*q), GFP_ATOMIC);
 		if (table->tab[dp] == NULL)
 			return -ENOMEM;
 	}