forked from Minki/linux
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>
46 lines
1.5 KiB
C
46 lines
1.5 KiB
C
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
|
|
#ifndef __ASM_GENERIC_SEMBUF_H
|
|
#define __ASM_GENERIC_SEMBUF_H
|
|
|
|
#include <asm/bitsperlong.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.
|
|
*
|
|
* semid64_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 padding is in the wrong place for
|
|
* historic reasons, so user space has to reconstruct a time_t
|
|
* value using
|
|
*
|
|
* user_semid_ds.sem_otime = kernel_semid64_ds.sem_otime +
|
|
* ((long long)kernel_semid64_ds.sem_otime_high << 32)
|
|
*
|
|
* Pad space is left for 2 miscellaneous 32-bit values
|
|
*/
|
|
struct semid64_ds {
|
|
struct ipc64_perm sem_perm; /* permissions .. see ipc.h */
|
|
#if __BITS_PER_LONG == 64
|
|
long sem_otime; /* last semop time */
|
|
long sem_ctime; /* last change time */
|
|
#else
|
|
unsigned long sem_otime; /* last semop time */
|
|
unsigned long sem_otime_high;
|
|
unsigned long sem_ctime; /* last change time */
|
|
unsigned long sem_ctime_high;
|
|
#endif
|
|
unsigned long sem_nsems; /* no. of semaphores in array */
|
|
unsigned long __unused3;
|
|
unsigned long __unused4;
|
|
};
|
|
|
|
#endif /* __ASM_GENERIC_SEMBUF_H */
|