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

Message ID 20191030063855.9989-3-yamada.masahiro@socionext.com
State New
Headers show
Series
  • [1/3] arch: ipcbuf.h: make uapi asm/ipcbuf.h self-contained
Related show

Commit Message

Masahiro Yamada Oct. 30, 2019, 6:38 a.m.
The user-space 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.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

---

 arch/mips/include/uapi/asm/sembuf.h    | 2 ++
 arch/parisc/include/uapi/asm/sembuf.h  | 1 +
 arch/powerpc/include/uapi/asm/sembuf.h | 2 ++
 arch/sparc/include/uapi/asm/sembuf.h   | 2 ++
 arch/x86/include/uapi/asm/sembuf.h     | 2 ++
 arch/xtensa/include/uapi/asm/sembuf.h  | 1 +
 include/uapi/asm-generic/sembuf.h      | 1 +
 usr/include/Makefile                   | 1 -
 8 files changed, 11 insertions(+), 1 deletion(-)

-- 
2.17.1

Comments

Masahiro Yamada Nov. 8, 2019, 5:51 a.m. | #1
Hi Andrew,

I think you modified the commit log before applying this patch.
I just noticed a typo.


commit 411865d8dd2c31f56eefc54bc16fabb47e1bfb73
Author: Masahiro Yamada <yamada.masahiro@socionext.com>
Date:   Wed Nov 6 16:07:08 2019 +1100

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

    Uuserspace cannot compile <asm/sembuf.h> due to some missing type
    definitions.  For example, building it for x86 fails as follows:



If possible, could you fix up  s/Uuserspace/Userspace/  ?


Thanks.
Masahiro Yamada





On Wed, Oct 30, 2019 at 3:40 PM Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
>

> The user-space 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.

>

> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

> ---

>

>  arch/mips/include/uapi/asm/sembuf.h    | 2 ++

>  arch/parisc/include/uapi/asm/sembuf.h  | 1 +

>  arch/powerpc/include/uapi/asm/sembuf.h | 2 ++

>  arch/sparc/include/uapi/asm/sembuf.h   | 2 ++

>  arch/x86/include/uapi/asm/sembuf.h     | 2 ++

>  arch/xtensa/include/uapi/asm/sembuf.h  | 1 +

>  include/uapi/asm-generic/sembuf.h      | 1 +

>  usr/include/Makefile                   | 1 -

>  8 files changed, 11 insertions(+), 1 deletion(-)

>

> diff --git a/arch/mips/include/uapi/asm/sembuf.h b/arch/mips/include/uapi/asm/sembuf.h

> index 60c89e6cb25b..7d135b93bebd 100644

> --- a/arch/mips/include/uapi/asm/sembuf.h

> +++ b/arch/mips/include/uapi/asm/sembuf.h

> @@ -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

> diff --git a/arch/parisc/include/uapi/asm/sembuf.h b/arch/parisc/include/uapi/asm/sembuf.h

> index 3c31163b1241..b17a2460b184 100644

> --- a/arch/parisc/include/uapi/asm/sembuf.h

> +++ b/arch/parisc/include/uapi/asm/sembuf.h

> @@ -3,6 +3,7 @@

>  #define _PARISC_SEMBUF_H

>

>  #include <asm/bitsperlong.h>

> +#include <asm/ipcbuf.h>

>

>  /*

>   * The semid64_ds structure for parisc architecture.

> diff --git a/arch/powerpc/include/uapi/asm/sembuf.h b/arch/powerpc/include/uapi/asm/sembuf.h

> index 3f60946f77e3..f42c9c3502c7 100644

> --- a/arch/powerpc/include/uapi/asm/sembuf.h

> +++ b/arch/powerpc/include/uapi/asm/sembuf.h

> @@ -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

> diff --git a/arch/sparc/include/uapi/asm/sembuf.h b/arch/sparc/include/uapi/asm/sembuf.h

> index f3d309c2e1cd..5d7764cdf80f 100644

> --- a/arch/sparc/include/uapi/asm/sembuf.h

> +++ b/arch/sparc/include/uapi/asm/sembuf.h

> @@ -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

> diff --git a/arch/x86/include/uapi/asm/sembuf.h b/arch/x86/include/uapi/asm/sembuf.h

> index 89de6cd9f0a7..da0464af7aa6 100644

> --- a/arch/x86/include/uapi/asm/sembuf.h

> +++ b/arch/x86/include/uapi/asm/sembuf.h

> @@ -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

> diff --git a/arch/xtensa/include/uapi/asm/sembuf.h b/arch/xtensa/include/uapi/asm/sembuf.h

> index 09f348d643f1..3b9cdd406dfe 100644

> --- a/arch/xtensa/include/uapi/asm/sembuf.h

> +++ b/arch/xtensa/include/uapi/asm/sembuf.h

> @@ -22,6 +22,7 @@

>  #define _XTENSA_SEMBUF_H

>

>  #include <asm/byteorder.h>

> +#include <asm/ipcbuf.h>

>

>  struct semid64_ds {

>         struct ipc64_perm sem_perm;             /* permissions .. see ipc.h */

> diff --git a/include/uapi/asm-generic/sembuf.h b/include/uapi/asm-generic/sembuf.h

> index 0bae010f1b64..5807fcd643ba 100644

> --- a/include/uapi/asm-generic/sembuf.h

> +++ b/include/uapi/asm-generic/sembuf.h

> @@ -3,6 +3,7 @@

>  #define __ASM_GENERIC_SEMBUF_H

>

>  #include <asm/bitsperlong.h>

> +#include <asm/ipcbuf.h>

>

>  /*

>   * The semid64_ds structure for x86 architecture.

> diff --git a/usr/include/Makefile b/usr/include/Makefile

> index 099d7401aa23..107d04bd5ee3 100644

> --- a/usr/include/Makefile

> +++ b/usr/include/Makefile

> @@ -16,7 +16,6 @@ override c_flags = $(UAPI_CFLAGS) -Wp,-MD,$(depfile) -I$(objtree)/usr/include

>  # Please consider to fix the header first.

>  #

>  # Sorted alphabetically.

> -header-test- += asm/sembuf.h

>  header-test- += asm/shmbuf.h

>  header-test- += asm/signal.h

>  header-test- += asm/ucontext.h

> --

> 2.17.1

>



-- 
Best Regards
Masahiro Yamada

Patch

diff --git a/arch/mips/include/uapi/asm/sembuf.h b/arch/mips/include/uapi/asm/sembuf.h
index 60c89e6cb25b..7d135b93bebd 100644
--- a/arch/mips/include/uapi/asm/sembuf.h
+++ b/arch/mips/include/uapi/asm/sembuf.h
@@ -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
diff --git a/arch/parisc/include/uapi/asm/sembuf.h b/arch/parisc/include/uapi/asm/sembuf.h
index 3c31163b1241..b17a2460b184 100644
--- a/arch/parisc/include/uapi/asm/sembuf.h
+++ b/arch/parisc/include/uapi/asm/sembuf.h
@@ -3,6 +3,7 @@ 
 #define _PARISC_SEMBUF_H
 
 #include <asm/bitsperlong.h>
+#include <asm/ipcbuf.h>
 
 /* 
  * The semid64_ds structure for parisc architecture.
diff --git a/arch/powerpc/include/uapi/asm/sembuf.h b/arch/powerpc/include/uapi/asm/sembuf.h
index 3f60946f77e3..f42c9c3502c7 100644
--- a/arch/powerpc/include/uapi/asm/sembuf.h
+++ b/arch/powerpc/include/uapi/asm/sembuf.h
@@ -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
diff --git a/arch/sparc/include/uapi/asm/sembuf.h b/arch/sparc/include/uapi/asm/sembuf.h
index f3d309c2e1cd..5d7764cdf80f 100644
--- a/arch/sparc/include/uapi/asm/sembuf.h
+++ b/arch/sparc/include/uapi/asm/sembuf.h
@@ -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
diff --git a/arch/x86/include/uapi/asm/sembuf.h b/arch/x86/include/uapi/asm/sembuf.h
index 89de6cd9f0a7..da0464af7aa6 100644
--- a/arch/x86/include/uapi/asm/sembuf.h
+++ b/arch/x86/include/uapi/asm/sembuf.h
@@ -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
diff --git a/arch/xtensa/include/uapi/asm/sembuf.h b/arch/xtensa/include/uapi/asm/sembuf.h
index 09f348d643f1..3b9cdd406dfe 100644
--- a/arch/xtensa/include/uapi/asm/sembuf.h
+++ b/arch/xtensa/include/uapi/asm/sembuf.h
@@ -22,6 +22,7 @@ 
 #define _XTENSA_SEMBUF_H
 
 #include <asm/byteorder.h>
+#include <asm/ipcbuf.h>
 
 struct semid64_ds {
 	struct ipc64_perm sem_perm;		/* permissions .. see ipc.h */
diff --git a/include/uapi/asm-generic/sembuf.h b/include/uapi/asm-generic/sembuf.h
index 0bae010f1b64..5807fcd643ba 100644
--- a/include/uapi/asm-generic/sembuf.h
+++ b/include/uapi/asm-generic/sembuf.h
@@ -3,6 +3,7 @@ 
 #define __ASM_GENERIC_SEMBUF_H
 
 #include <asm/bitsperlong.h>
+#include <asm/ipcbuf.h>
 
 /*
  * The semid64_ds structure for x86 architecture.
diff --git a/usr/include/Makefile b/usr/include/Makefile
index 099d7401aa23..107d04bd5ee3 100644
--- a/usr/include/Makefile
+++ b/usr/include/Makefile
@@ -16,7 +16,6 @@  override c_flags = $(UAPI_CFLAGS) -Wp,-MD,$(depfile) -I$(objtree)/usr/include
 # Please consider to fix the header first.
 #
 # Sorted alphabetically.
-header-test- += asm/sembuf.h
 header-test- += asm/shmbuf.h
 header-test- += asm/signal.h
 header-test- += asm/ucontext.h