mirror of
https://github.com/torvalds/linux
synced 2024-07-21 18:51:47 +00:00
9ef0e00418
Userspace cannot compile <asm/msgbuf.h> due to some missing type
definitions. For example, building it for x86 fails as follows:
CC usr/include/asm/msgbuf.h.s
In file included from usr/include/asm/msgbuf.h:6:0,
from <command-line>:32:
usr/include/asm-generic/msgbuf.h:25:20: error: field `msg_perm' has incomplete type
struct ipc64_perm msg_perm;
^~~~~~~~
usr/include/asm-generic/msgbuf.h:27:2: error: unknown type name `__kernel_time_t'
__kernel_time_t msg_stime; /* last msgsnd time */
^~~~~~~~~~~~~~~
usr/include/asm-generic/msgbuf.h:28:2: error: unknown type name `__kernel_time_t'
__kernel_time_t msg_rtime; /* last msgrcv time */
^~~~~~~~~~~~~~~
usr/include/asm-generic/msgbuf.h:29:2: error: unknown type name `__kernel_time_t'
__kernel_time_t msg_ctime; /* last change time */
^~~~~~~~~~~~~~~
usr/include/asm-generic/msgbuf.h:41:2: error: unknown type name `__kernel_pid_t'
__kernel_pid_t msg_lspid; /* pid of last msgsnd */
^~~~~~~~~~~~~~
usr/include/asm-generic/msgbuf.h:42:2: error: unknown type name `__kernel_pid_t'
__kernel_pid_t msg_lrpid; /* last receive pid */
^~~~~~~~~~~~~~
It is just a matter of missing include directive.
Include <asm/ipcbuf.h> to make it self-contained, and add it to
the compile-test coverage.
Link: http://lkml.kernel.org/r/20191030063855.9989-2-yamada.masahiro@socionext.com
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
50 lines
1.6 KiB
C
50 lines
1.6 KiB
C
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
|
|
#ifndef __ASM_GENERIC_MSGBUF_H
|
|
#define __ASM_GENERIC_MSGBUF_H
|
|
|
|
#include <asm/bitsperlong.h>
|
|
#include <asm/ipcbuf.h>
|
|
|
|
/*
|
|
* generic msqid64_ds structure.
|
|
*
|
|
* Note extra padding because this structure is passed back and forth
|
|
* between kernel and user space.
|
|
*
|
|
* msqid64_ds was originally meant to be architecture specific, but
|
|
* everyone just ended up making identical copies without specific
|
|
* optimizations, so we may just as well all use the same one.
|
|
*
|
|
* 64 bit architectures use a 64-bit long time field here, while
|
|
* 32 bit architectures have a pair of unsigned long values.
|
|
* On big-endian systems, the lower half is in the wrong place.
|
|
*
|
|
* Pad space is left for:
|
|
* - 2 miscellaneous 32-bit values
|
|
*/
|
|
|
|
struct msqid64_ds {
|
|
struct ipc64_perm msg_perm;
|
|
#if __BITS_PER_LONG == 64
|
|
long msg_stime; /* last msgsnd time */
|
|
long msg_rtime; /* last msgrcv time */
|
|
long msg_ctime; /* last change time */
|
|
#else
|
|
unsigned long msg_stime; /* last msgsnd time */
|
|
unsigned long msg_stime_high;
|
|
unsigned long msg_rtime; /* last msgrcv time */
|
|
unsigned long msg_rtime_high;
|
|
unsigned long msg_ctime; /* last change time */
|
|
unsigned long msg_ctime_high;
|
|
#endif
|
|
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 __unused4;
|
|
unsigned long __unused5;
|
|
};
|
|
|
|
#endif /* __ASM_GENERIC_MSGBUF_H */
|