[glibc/zack/no-nested-includes] sysvipc: Fix compat msgctl (BZ#24570)

[glibc/zack/no-nested-includes] sysvipc: Fix compat msgctl (BZ#24570)

[Zack Weinberg]

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=dfba907fedcb0e95af735a2d064761559f703ab6

commit dfba907fedcb0e95af735a2d064761559f703ab6
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date:   Tue May 14 15:01:32 2019 -0300

    sysvipc: Fix compat msgctl (BZ#24570)
    
    The __IPC64 flags is meant to be used to enable the new sysv struct
    format when the architectures supports it (ARCH_WANT_IPC_PARSE_VERSION
    config flag on Linux kernel).
    
    This currently issue only affects alpha.
    
    	[BZ #24570]
    	* sysdeps/unix/sysv/linux/msgctl.c (__old_msgctl): Remove __IPC_64
    	usage.

Diff:
---
 ChangeLog                        | 6 ++++++
 sysdeps/unix/sysv/linux/msgctl.c | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index a7185b6..2977d21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2019-05-20  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
+
+	[BZ #24570]
+	* sysdeps/unix/sysv/linux/msgctl.c (__old_msgctl): Remove __IPC_64
+	usage.
+
 2019-05-20  Joseph Myers  <joseph@codesourcery.com>
 
 	* elf/elf.h (NT_ARM_PACA_KEYS): New macro.
diff --git a/sysdeps/unix/sysv/linux/msgctl.c b/sysdeps/unix/sysv/linux/msgctl.c
index e4f78ad..2d49567 100644
--- a/sysdeps/unix/sysv/linux/msgctl.c
+++ b/sysdeps/unix/sysv/linux/msgctl.c
@@ -62,7 +62,7 @@ attribute_compat_text_section
 __old_msgctl (int msqid, int cmd, struct __old_msqid_ds *buf)
 {
 #ifdef __ASSUME_DIRECT_SYSVIPC_SYSCALLS
-  return INLINE_SYSCALL_CALL (msgctl, msqid, cmd | __IPC_64, buf);
+  return INLINE_SYSCALL_CALL (msgctl, msqid, cmd, buf);
 #else
   return INLINE_SYSCALL_CALL (ipc, IPCOP_msgctl, msqid, cmd, 0, buf);
 #endif