kernel/linux
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ synced 2026-10-18 19:12:56 +00:00
Code Issues Releases Packages Activity
linux/tools/include/uapi/asm-generic
History
Florian Fainelli 9b31e60800 tools: Fixed MIPS builds due to struct flock re-definition 
Building perf for MIPS failed after 9f79b8b723 ("uapi: simplify
__ARCH_FLOCK{,64}_PAD a little") with the following error:

  CC
/home/fainelli/work/buildroot/output/bmips/build/linux-custom/tools/perf/trace/beauty/fcntl.o
In file included from
../../../../host/mipsel-buildroot-linux-gnu/sysroot/usr/include/asm/fcntl.h:77,
                 from ../include/uapi/linux/fcntl.h:5,
                 from trace/beauty/fcntl.c:10:
../include/uapi/asm-generic/fcntl.h:188:8: error: redefinition of
'struct flock'
 struct flock {
        ^~~~~
In file included from ../include/uapi/linux/fcntl.h:5,
                 from trace/beauty/fcntl.c:10:
../../../../host/mipsel-buildroot-linux-gnu/sysroot/usr/include/asm/fcntl.h:63:8:
note: originally defined here
 struct flock {
        ^~~~~

This is due to the local copy under
tools/include/uapi/asm-generic/fcntl.h including the toolchain's kernel
headers which already define 'struct flock' and define
HAVE_ARCH_STRUCT_FLOCK to future inclusions make a decision as to
whether re-defining 'struct flock' is appropriate or not.

Make sure what do not re-define 'struct flock'
when HAVE_ARCH_STRUCT_FLOCK is already defined.

Fixes: 9f79b8b723 ("uapi: simplify __ARCH_FLOCK{,64}_PAD a little")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
[arnd: sync with include/uapi/asm-generic/fcntl.h as well]
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
History 2022-07-20 12:55:33 +02:00
..
bitsperlong.h tools: Copy the bitsperlong.h files from the kernel 2016-07-12 15:20:39 -03:00
bpf_perf_event.h selftests/bpf: sync kernel headers and introduce arch support in Makefile 2017-12-05 15:02:41 +01:00
errno-base.h tools include asm-generic: Grab errno.h and errno-base.h 2018-01-23 09:51:37 -03:00
errno.h tools include asm-generic: Grab errno.h and errno-base.h 2018-01-23 09:51:37 -03:00
fcntl.h tools: Fixed MIPS builds due to struct flock re-definition 2022-07-20 12:55:33 +02:00
ioctls.h tools uapi asm-generic: Synchronize ioctls.h 2018-11-19 12:31:45 -08:00
mman-common-tools.h tools headers uapi: Sync asm-generic/mman-common.h and linux/mman.h 2019-03-28 14:31:56 -03:00
mman-common.h tools headers UAPI: Sync asm-generic/mman-common.h with the kernel 2022-04-01 16:19:35 -03:00
mman.h tools headers UAPI: Update tools's copy of mman.h headers 2019-07-29 09:02:58 -03:00
socket.h net: SO_RCVMARK socket option for SO_MARK with recvmsg() 2022-04-28 13:08:15 -07:00
unistd.h syscalls: compat: Fix the missing part for __SYSCALL_COMPAT 2022-04-26 13:36:01 -07:00