mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-31 08:28:13 +00:00
0fb9dc2867
Userspace cannot compile <asm/sembuf.h> due to some missing type
definitions. For example, building it for x86 fails as follows:
CC usr/include/asm/sembuf.h.s
In file included from <command-line>:32:0:
usr/include/asm/sembuf.h:17:20: error: field `sem_perm' has incomplete type
struct ipc64_perm sem_perm; /* permissions .. see ipc.h */
^~~~~~~~
usr/include/asm/sembuf.h:24:2: error: unknown type name `__kernel_time_t'
__kernel_time_t sem_otime; /* last semop time */
^~~~~~~~~~~~~~~
usr/include/asm/sembuf.h:25:2: error: unknown type name `__kernel_ulong_t'
__kernel_ulong_t __unused1;
^~~~~~~~~~~~~~~~
usr/include/asm/sembuf.h:26:2: error: unknown type name `__kernel_time_t'
__kernel_time_t sem_ctime; /* last change time */
^~~~~~~~~~~~~~~
usr/include/asm/sembuf.h:27:2: error: unknown type name `__kernel_ulong_t'
__kernel_ulong_t __unused2;
^~~~~~~~~~~~~~~~
usr/include/asm/sembuf.h:29:2: error: unknown type name `__kernel_ulong_t'
__kernel_ulong_t sem_nsems; /* no. of semaphores in array */
^~~~~~~~~~~~~~~~
usr/include/asm/sembuf.h:30:2: error: unknown type name `__kernel_ulong_t'
__kernel_ulong_t __unused3;
^~~~~~~~~~~~~~~~
usr/include/asm/sembuf.h:31:2: error: unknown type name `__kernel_ulong_t'
__kernel_ulong_t __unused4;
^~~~~~~~~~~~~~~~
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-3-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>
36 lines
1 KiB
C
36 lines
1 KiB
C
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
|
|
#ifndef _ASM_X86_SEMBUF_H
|
|
#define _ASM_X86_SEMBUF_H
|
|
|
|
#include <asm/ipcbuf.h>
|
|
|
|
/*
|
|
* The semid64_ds structure for x86 architecture.
|
|
* Note extra padding because this structure is passed back and forth
|
|
* between kernel and user space.
|
|
*
|
|
* Pad space is left for:
|
|
* - 2 miscellaneous 32-bit values
|
|
*
|
|
* x86_64 and x32 incorrectly added padding here, so the structures
|
|
* are still incompatible with the padding on x86.
|
|
*/
|
|
struct semid64_ds {
|
|
struct ipc64_perm sem_perm; /* permissions .. see ipc.h */
|
|
#ifdef __i386__
|
|
unsigned long sem_otime; /* last semop time */
|
|
unsigned long sem_otime_high;
|
|
unsigned long sem_ctime; /* last change time */
|
|
unsigned long sem_ctime_high;
|
|
#else
|
|
__kernel_long_t sem_otime; /* last semop time */
|
|
__kernel_ulong_t __unused1;
|
|
__kernel_long_t sem_ctime; /* last change time */
|
|
__kernel_ulong_t __unused2;
|
|
#endif
|
|
__kernel_ulong_t sem_nsems; /* no. of semaphores in array */
|
|
__kernel_ulong_t __unused3;
|
|
__kernel_ulong_t __unused4;
|
|
};
|
|
|
|
#endif /* _ASM_X86_SEMBUF_H */
|