Commit 9ef0e004 authored Dec 04, 2019 by Masahiro Yamada Committed by Linus Torvalds Dec 04, 2019

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

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>

parent 5b009673

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@
		#ifndef _ASM_MSGBUF_H
		#define _ASM_MSGBUF_H

		#include <asm/ipcbuf.h>

		/*
		* The msqid64_ds structure for the MIPS architecture.

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

+1 −0

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

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

		/*
		* The msqid64_ds structure for parisc architecture, copied from sparc.

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

+2 −0

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

		#include <asm/ipcbuf.h>

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

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

+2 −0

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

		#include <asm/ipcbuf.h>

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

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,9 @@
		#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.
		*

Admin message