diff options
author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /ipc/msg.c | |
parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'ipc/msg.c')
-rw-r--r-- | ipc/msg.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -412,7 +412,7 @@ static int msgctl_down(struct ipc_namespace *ns, int msqid, int cmd, | |||
412 | struct msqid_ds __user *buf, int version) | 412 | struct msqid_ds __user *buf, int version) |
413 | { | 413 | { |
414 | struct kern_ipc_perm *ipcp; | 414 | struct kern_ipc_perm *ipcp; |
415 | struct msqid64_ds msqid64; | 415 | struct msqid64_ds uninitialized_var(msqid64); |
416 | struct msg_queue *msq; | 416 | struct msg_queue *msq; |
417 | int err; | 417 | int err; |
418 | 418 | ||