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>
This commit is contained in:
parent
5b00967359
commit
9ef0e00418
|
@ -2,6 +2,7 @@
|
||||||
#ifndef _ASM_MSGBUF_H
|
#ifndef _ASM_MSGBUF_H
|
||||||
#define _ASM_MSGBUF_H
|
#define _ASM_MSGBUF_H
|
||||||
|
|
||||||
|
#include <asm/ipcbuf.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The msqid64_ds structure for the MIPS architecture.
|
* The msqid64_ds structure for the MIPS architecture.
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
#define _PARISC_MSGBUF_H
|
#define _PARISC_MSGBUF_H
|
||||||
|
|
||||||
#include <asm/bitsperlong.h>
|
#include <asm/bitsperlong.h>
|
||||||
|
#include <asm/ipcbuf.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The msqid64_ds structure for parisc architecture, copied from sparc.
|
* The msqid64_ds structure for parisc architecture, copied from sparc.
|
||||||
|
|
|
@ -2,6 +2,8 @@
|
||||||
#ifndef _ASM_POWERPC_MSGBUF_H
|
#ifndef _ASM_POWERPC_MSGBUF_H
|
||||||
#define _ASM_POWERPC_MSGBUF_H
|
#define _ASM_POWERPC_MSGBUF_H
|
||||||
|
|
||||||
|
#include <asm/ipcbuf.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The msqid64_ds structure for the PowerPC architecture.
|
* The msqid64_ds structure for the PowerPC architecture.
|
||||||
* Note extra padding because this structure is passed back and forth
|
* Note extra padding because this structure is passed back and forth
|
||||||
|
|
|
@ -2,6 +2,8 @@
|
||||||
#ifndef _SPARC_MSGBUF_H
|
#ifndef _SPARC_MSGBUF_H
|
||||||
#define _SPARC_MSGBUF_H
|
#define _SPARC_MSGBUF_H
|
||||||
|
|
||||||
|
#include <asm/ipcbuf.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The msqid64_ds structure for sparc64 architecture.
|
* The msqid64_ds structure for sparc64 architecture.
|
||||||
* Note extra padding because this structure is passed back and forth
|
* Note extra padding because this structure is passed back and forth
|
||||||
|
|
|
@ -5,6 +5,9 @@
|
||||||
#if !defined(__x86_64__) || !defined(__ILP32__)
|
#if !defined(__x86_64__) || !defined(__ILP32__)
|
||||||
#include <asm-generic/msgbuf.h>
|
#include <asm-generic/msgbuf.h>
|
||||||
#else
|
#else
|
||||||
|
|
||||||
|
#include <asm/ipcbuf.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The msqid64_ds structure for x86 architecture with x32 ABI.
|
* The msqid64_ds structure for x86 architecture with x32 ABI.
|
||||||
*
|
*
|
||||||
|
|
|
@ -17,6 +17,8 @@
|
||||||
#ifndef _XTENSA_MSGBUF_H
|
#ifndef _XTENSA_MSGBUF_H
|
||||||
#define _XTENSA_MSGBUF_H
|
#define _XTENSA_MSGBUF_H
|
||||||
|
|
||||||
|
#include <asm/ipcbuf.h>
|
||||||
|
|
||||||
struct msqid64_ds {
|
struct msqid64_ds {
|
||||||
struct ipc64_perm msg_perm;
|
struct ipc64_perm msg_perm;
|
||||||
#ifdef __XTENSA_EB__
|
#ifdef __XTENSA_EB__
|
||||||
|
|
|
@ -3,6 +3,8 @@
|
||||||
#define __ASM_GENERIC_MSGBUF_H
|
#define __ASM_GENERIC_MSGBUF_H
|
||||||
|
|
||||||
#include <asm/bitsperlong.h>
|
#include <asm/bitsperlong.h>
|
||||||
|
#include <asm/ipcbuf.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* generic msqid64_ds structure.
|
* generic msqid64_ds structure.
|
||||||
*
|
*
|
||||||
|
|
|
@ -16,7 +16,6 @@ override c_flags = $(UAPI_CFLAGS) -Wp,-MD,$(depfile) -I$(objtree)/usr/include
|
||||||
# Please consider to fix the header first.
|
# Please consider to fix the header first.
|
||||||
#
|
#
|
||||||
# Sorted alphabetically.
|
# Sorted alphabetically.
|
||||||
header-test- += asm/msgbuf.h
|
|
||||||
header-test- += asm/sembuf.h
|
header-test- += asm/sembuf.h
|
||||||
header-test- += asm/shmbuf.h
|
header-test- += asm/shmbuf.h
|
||||||
header-test- += asm/signal.h
|
header-test- += asm/signal.h
|
||||||
|
|
Loading…
Reference in New Issue