diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-17 17:26:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-17 17:26:26 -0800 |
| commit | 42f9cabebe5915351bdba2f6f7f80e47c68e6ac8 (patch) | |
| tree | ae7487319d876ce736430a97a178af557fe2a189 /net/ipv6/route.c | |
| parent | 976164497d6d8050403c96894ad418de44ec748f (diff) | |
| parent | 9e147a1cfce5ec6308b024abe425d5b4e1884a03 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv6/route.c')
| -rw-r--r-- | net/ipv6/route.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 9a71a8d1078a..a7a537b50595 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -1732,7 +1732,7 @@ int inet6_dump_fib(struct sk_buff *skb, struct netlink_callback *cb) /* * 2. allocate and initialize walker. */ - w = kmalloc(sizeof(*w), GFP_KERNEL); + w = kmalloc(sizeof(*w), GFP_ATOMIC); if (w == NULL) return -ENOMEM; RT6_TRACE("dump<%p", w); |