Re: LTP testing: msgctl/IPC_STAT

[Carsten Langgaard <carstenl@mips.com>]

I also send this patch a week ago. Ralf could you please applied it.
If there is any objection against changing this structure in the kernel, then we
need a glibc fix instead.

/Carsten


Johannes Stezenbach wrote:

> I was investigating LTP test suite failures of the msgctl01,
> msgctl02, msgsnd01 and msgsnd02 tests. It seems that they
> are caused by a mismatch between /usr/include/bits/msq.h
> and linux/include/asm-mips/msgbuf.h.
>
> I suggest the following patch which makes mips' msgbuf.h
> a copy of the one in include/asm-i386.
>
> Johannes
>
> Index: linux/include/asm-mips/msgbuf.h
> ===================================================================
> RCS file: /cvs/linux/include/asm-mips/msgbuf.h,v
> retrieving revision 1.1
> diff -u -r1.1 msgbuf.h
> --- linux/include/asm-mips/msgbuf.h     2000/02/16 01:07:48     1.1
> +++ linux/include/asm-mips/msgbuf.h     2002/07/19 14:20:29
> @@ -2,26 +2,30 @@
>  #define _ASM_MSGBUF_H
>
>  /*
> - * The msqid64_ds structure for alpha architecture.
> + * The msqid64_ds structure for mips architecture.
>   * Note extra padding because this structure is passed back and forth
>   * between kernel and user space.
>   *
>   * Pad space is left for:
> - * - 2 miscellaneous 64-bit values
> + * - 64-bit time_t to solve y2038 problem
> + * - 2 miscellaneous 32-bit values
>   */
>
>  struct msqid64_ds {
>         struct ipc64_perm msg_perm;
>         __kernel_time_t msg_stime;      /* last msgsnd time */
> +       unsigned long   __unused1;
>         __kernel_time_t msg_rtime;      /* last msgrcv time */
> +       unsigned long   __unused2;
>         __kernel_time_t msg_ctime;      /* last change time */
> +       unsigned long   __unused3;
>         unsigned long  msg_cbytes;      /* current number of bytes on queue */
>         unsigned long  msg_qnum;        /* number of messages in queue */
>         unsigned long  msg_qbytes;      /* max number of bytes on queue */
>         __kernel_pid_t msg_lspid;       /* pid of last msgsnd */
>         __kernel_pid_t msg_lrpid;       /* last receive pid */
> -       unsigned long  __unused1;
> -       unsigned long  __unused2;
> +       unsigned long  __unused4;
> +       unsigned long  __unused5;
>  };
>
>  #endif /* _ASM_MSGBUF_H */

--
_    _ ____  ___   Carsten Langgaard   Mailto:carstenl@mips.com
|\  /|||___)(___   MIPS Denmark        Direct: +45 4486 5527
| \/ |||    ____)  Lautrupvang 4B      Switch: +45 4486 5555
  TECHNOLOGIES     2750 Ballerup       Fax...: +45 4486 5556
                   Denmark             http://www.mips.com