Commit 0fb9dc28 authored Dec 04, 2019 by Masahiro Yamada Committed by Linus Torvalds Dec 04, 2019

arch: sembuf.h: make uapi asm/sembuf.h self-contained

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>

parent 9ef0e004

arch/mips/include/uapi/asm/sembuf.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,8 @@
		#ifndef _ASM_SEMBUF_H
		#define _ASM_SEMBUF_H

		#include <asm/ipcbuf.h>

		/*
		* The semid64_ds structure for the MIPS architecture.
		* Note extra padding because this structure is passed back and forth

arch/parisc/include/uapi/asm/sembuf.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@
		#define _PARISC_SEMBUF_H

		#include <asm/bitsperlong.h>
		#include <asm/ipcbuf.h>

		/*
		* The semid64_ds structure for parisc architecture.

arch/powerpc/include/uapi/asm/sembuf.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,8 @@
		#ifndef _ASM_POWERPC_SEMBUF_H
		#define _ASM_POWERPC_SEMBUF_H

		#include <asm/ipcbuf.h>

		/*
		* This program is free software; you can redistribute it and/or
		* modify it under the terms of the GNU General Public License

arch/sparc/include/uapi/asm/sembuf.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,8 @@
		#ifndef _SPARC_SEMBUF_H
		#define _SPARC_SEMBUF_H

		#include <asm/ipcbuf.h>

		/*
		* The semid64_ds structure for sparc architecture.
		* Note extra padding because this structure is passed back and forth

arch/x86/include/uapi/asm/sembuf.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,8 @@
		#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

Admin message