diff options
| author | Pekka Enberg <penberg@kernel.org> | 2010-10-24 12:57:05 -0400 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2010-10-24 12:57:05 -0400 |
| commit | 6d4121f6c20a0e86231d52f535f1c82423b3326f (patch) | |
| tree | 5c235cac699ca86b504850aa663ddadde0455a61 /net/tipc/msg.c | |
| parent | 92a5bbc11ff2442a54b2f1d313088c245828ef4e (diff) | |
| parent | 35da7a307c535f9c2929cae277f3df425c9f9b1e (diff) | |
Merge branch 'master' into for-linus
Conflicts:
include/linux/percpu.h
mm/percpu.c
Diffstat (limited to 'net/tipc/msg.c')
| -rw-r--r-- | net/tipc/msg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/msg.c b/net/tipc/msg.c index 381063817b41..ecb532fb0351 100644 --- a/net/tipc/msg.c +++ b/net/tipc/msg.c | |||
| @@ -112,7 +112,7 @@ int tipc_msg_build(struct tipc_msg *hdr, | |||
| 112 | return dsz; | 112 | return dsz; |
| 113 | } | 113 | } |
| 114 | 114 | ||
| 115 | *buf = buf_acquire(sz); | 115 | *buf = tipc_buf_acquire(sz); |
| 116 | if (!(*buf)) | 116 | if (!(*buf)) |
| 117 | return -ENOMEM; | 117 | return -ENOMEM; |
| 118 | skb_copy_to_linear_data(*buf, hdr, hsz); | 118 | skb_copy_to_linear_data(*buf, hdr, hsz); |