mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-01 06:33:07 +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>
35 lines
1.1 KiB
C
35 lines
1.1 KiB
C
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
|
|
#ifndef __ASM_X64_MSGBUF_H
|
|
#define __ASM_X64_MSGBUF_H
|
|
|
|
#if !defined(__x86_64__) || !defined(__ILP32__)
|
|
#include <asm-generic/msgbuf.h>
|
|
#else
|
|
|
|
#include <asm/ipcbuf.h>
|
|
|
|
/*
|
|
* The msqid64_ds structure for x86 architecture with x32 ABI.
|
|
*
|
|
* On x86-32 and x86-64 we can just use the generic definition, but
|
|
* x32 uses the same binary layout as x86_64, which is differnet
|
|
* from other 32-bit architectures.
|
|
*/
|
|
|
|
struct msqid64_ds {
|
|
struct ipc64_perm msg_perm;
|
|
__kernel_long_t msg_stime; /* last msgsnd time */
|
|
__kernel_long_t msg_rtime; /* last msgrcv time */
|
|
__kernel_long_t msg_ctime; /* last change time */
|
|
__kernel_ulong_t msg_cbytes; /* current number of bytes on queue */
|
|
__kernel_ulong_t msg_qnum; /* number of messages in queue */
|
|
__kernel_ulong_t 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 */
|
|
__kernel_ulong_t __unused4;
|
|
__kernel_ulong_t __unused5;
|
|
};
|
|
|
|
#endif
|
|
|
|
#endif /* __ASM_GENERIC_MSGBUF_H */
|