projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[NET]: Multiple namespaces in the all dst_ifdown routines.
[powerpc.git]
/
net
/
xfrm
/
xfrm_hash.c
diff --git
a/net/xfrm/xfrm_hash.c
b/net/xfrm/xfrm_hash.c
index
37643bb
..
a2023ec
100644
(file)
--- a/
net/xfrm/xfrm_hash.c
+++ b/
net/xfrm/xfrm_hash.c
@@
-17,15
+17,13
@@
struct hlist_head *xfrm_hash_alloc(unsigned int sz)
struct hlist_head *n;
if (sz <= PAGE_SIZE)
struct hlist_head *n;
if (sz <= PAGE_SIZE)
- n = k
m
alloc(sz, GFP_KERNEL);
+ n = k
z
alloc(sz, GFP_KERNEL);
else if (hashdist)
else if (hashdist)
- n = __vmalloc(sz, GFP_KERNEL, PAGE_KERNEL);
+ n = __vmalloc(sz, GFP_KERNEL
| __GFP_ZERO
, PAGE_KERNEL);
else
n = (struct hlist_head *)
else
n = (struct hlist_head *)
- __get_free_pages(GFP_KERNEL, get_order(sz));
-
- if (n)
- memset(n, 0, sz);
+ __get_free_pages(GFP_KERNEL | __GFP_NOWARN | __GFP_ZERO,
+ get_order(sz));
return n;
}
return n;
}