diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-12-11 10:57:42 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-12-11 10:57:42 -0800 |
| commit | 5c6baba84e1ac6a79b266b40e17e692aab6604a1 (patch) | |
| tree | 6ba34db1109107023d753dd9fd5c359b3b990a04 /fs/dlm/netlink.c | |
| parent | 893f38d144a4d96d2483cd7c3801d26e1b2c23e9 (diff) | |
| parent | 3ef884b4c04e857c283cc77ca70ad8f638d94b0e (diff) | |
| download | kernel-crypto-5c6baba84e1ac6a79b266b40e17e692aab6604a1.tar.gz kernel-crypto-5c6baba84e1ac6a79b266b40e17e692aab6604a1.tar.xz kernel-crypto-5c6baba84e1ac6a79b266b40e17e692aab6604a1.zip | |
Merge commit 'linus/master' into x86/urgent
Diffstat (limited to 'fs/dlm/netlink.c')
| -rw-r--r-- | fs/dlm/netlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/dlm/netlink.c b/fs/dlm/netlink.c index 55ea369f43a..052095cd592 100644 --- a/fs/dlm/netlink.c +++ b/fs/dlm/netlink.c @@ -26,7 +26,7 @@ static int prepare_data(u8 cmd, struct sk_buff **skbp, size_t size) struct sk_buff *skb; void *data; - skb = genlmsg_new(size, GFP_KERNEL); + skb = genlmsg_new(size, GFP_NOFS); if (!skb) return -ENOMEM; |