diff options
author | Simon Horman <horms+renesas@verge.net.au> | 2013-04-02 11:08:34 +0900 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2013-04-02 11:08:34 +0900 |
commit | 809609a5d8427b0025304dbb69a84a692d11c4f9 (patch) | |
tree | 95a544cda32d36e4a9ee1ce27c527406c54d91b4 /ipc/msgutil.c | |
parent | a4339a9cb46644e19278e4dd5d89b262a37cb0b0 (diff) | |
parent | 8585deb18580d04209a2986430aa0959ef38fce2 (diff) |
Merge branch 'soc' into pinmux-base
Conflicts:
drivers/pinctrl/sh-pfc/pfc-r8a7740.c
This merge is to provide r8a73a4 SoC files, which are added in the
soc branch and depended on by r8a73a4 pfc-changes which are to
be added to the pinmux branch.
Diffstat (limited to 'ipc/msgutil.c')
-rw-r--r-- | ipc/msgutil.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/ipc/msgutil.c b/ipc/msgutil.c index ebfcbfa8b7f2..5df8e4bf1db0 100644 --- a/ipc/msgutil.c +++ b/ipc/msgutil.c @@ -117,9 +117,6 @@ struct msg_msg *copy_msg(struct msg_msg *src, struct msg_msg *dst) if (alen > DATALEN_MSG) alen = DATALEN_MSG; - dst->next = NULL; - dst->security = NULL; - memcpy(dst + 1, src + 1, alen); len -= alen; |