---

yaml --- r: 276781 b: refs/heads/master c: 3f1e6d3 h: refs/heads/master i: 276779: 61f73eb v: v3
git-mirror · Dec 13, 2011 · f26854e · f26854e
1 parent 25a81ad
commit f26854e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;
 	}