From: Florian Fainelli <f.fainelli@gmail.com>
To: linux-kernel@vger.kernel.org, hch@lst.de,
Arnd Bergmann <arnd@arndb.de>,
linux-mips@vger.kernel.org,
"open list:GENERIC INCLUDE/ASM HEADER FILES"
<linux-arch@vger.kernel.org>
Cc: nathan@kernel.org, naresh.kamboju@linaro.org, heiko@sntech.de,
Palmer Dabbelt <palmer@rivosinc.com>, Guo Ren <guoren@kernel.org>
Subject: Re: [PATCH] tools: Fixed MIPS builds due to struct flock re-definition
Date: Sat, 16 Jul 2022 16:21:00 -0700 [thread overview]
Message-ID: <846d3845-1536-3306-b68d-d0097a2ff8ff@gmail.com> (raw)
In-Reply-To: <20220715185551.3951955-1-f.fainelli@gmail.com>
Le 15/07/2022 à 11:55, Florian Fainelli a écrit :
> Building perf for MIPS failed after 9f79b8b72339 ("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: 9f79b8b72339 ("uapi: simplify __ARCH_FLOCK{,64}_PAD a little")
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
> ---
Any chance to apply this patch prior to v5.19 being final? Thanks!
--
Florian
next prev parent reply other threads:[~2022-07-16 23:23 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-15 18:55 [PATCH] tools: Fixed MIPS builds due to struct flock re-definition Florian Fainelli
2022-07-16 23:21 ` Florian Fainelli [this message]
2022-07-19 0:17 ` Florian Fainelli
2022-07-19 4:30 ` Christoph Hellwig
2022-07-19 7:42 ` Arnd Bergmann
2022-07-19 15:16 ` Christoph Hellwig
2022-07-19 19:05 ` Florian Fainelli
2022-07-19 21:15 ` Arnd Bergmann
2022-07-19 21:17 ` Florian Fainelli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=846d3845-1536-3306-b68d-d0097a2ff8ff@gmail.com \
--to=f.fainelli@gmail.com \
--cc=arnd@arndb.de \
--cc=guoren@kernel.org \
--cc=hch@lst.de \
--cc=heiko@sntech.de \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=naresh.kamboju@linaro.org \
--cc=nathan@kernel.org \
--cc=palmer@rivosinc.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox