git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'rmobile-fixes-for-linus' of git://github.com/pmundt/linux-sh
[pandora-kernel.git]
/
net
/
sched
/
sch_gred.c
diff --git
a/net/sched/sch_gred.c
b/net/sched/sch_gred.c
index
b9493a0
..
6cd8ddf
100644
(file)
--- a/
net/sched/sch_gred.c
+++ b/
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;
}