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 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
net
/
xfrm
/
xfrm_hash.c
diff --git
a/net/xfrm/xfrm_hash.c
b/net/xfrm/xfrm_hash.c
index
a2023ec
..
1e98bc0
100644
(file)
--- a/
net/xfrm/xfrm_hash.c
+++ b/
net/xfrm/xfrm_hash.c
@@
-19,7
+19,7
@@
struct hlist_head *xfrm_hash_alloc(unsigned int sz)
if (sz <= PAGE_SIZE)
n = kzalloc(sz, GFP_KERNEL);
else if (hashdist)
- n =
__vmalloc(sz, GFP_KERNEL | __GFP_ZERO, PAGE_KERNEL
);
+ n =
vzalloc(sz
);
else
n = (struct hlist_head *)
__get_free_pages(GFP_KERNEL | __GFP_NOWARN | __GFP_ZERO,