From: Al Viro <viro@zeniv.linux.org.uk>
To: Christoph Hellwig <hch@lst.de>
Cc: Greg Ungerer <gerg@linux-m68k.org>,
Michal Simek <monstr@monstr.eu>,
linux-arm-kernel@lists.infradead.org,
linux-c6x-dev@linux-c6x.org,
uclinux-h8-devel@lists.sourceforge.jp,
linux-m68k@lists.linux-m68k.org, linux-riscv@lists.infradead.org,
linux-sh@vger.kernel.org, linux-xtensa@linux-xtensa.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 08/17] binfmt_flat: consolidate two version of flat_v2_reloc_t
Date: Tue, 25 Jun 2019 23:29:41 +0100 [thread overview]
Message-ID: <20190625222941.GA1343@ZenIV.linux.org.uk> (raw)
In-Reply-To: <20190613070903.17214-9-hch@lst.de>
On Thu, Jun 13, 2019 at 09:08:54AM +0200, Christoph Hellwig wrote:
> Two branches of the ifdef maze actually have the same content, so merge
> them.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> include/linux/flat.h | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/include/linux/flat.h b/include/linux/flat.h
> index 2b7cda6e9c1b..19c586b74b99 100644
> --- a/include/linux/flat.h
> +++ b/include/linux/flat.h
> @@ -69,15 +69,13 @@ struct flat_hdr {
> typedef union {
> unsigned long value;
> struct {
> -# if defined(mc68000) && !defined(CONFIG_COLDFIRE)
> +#if defined(__LITTLE_ENDIAN_BITFIELD) || \
> + (defined(mc68000) && !defined(CONFIG_COLDFIRE))
> signed long offset : 30;
> unsigned long type : 2;
> # elif defined(__BIG_ENDIAN_BITFIELD)
> unsigned long type : 2;
> signed long offset : 30;
> -# elif defined(__LITTLE_ENDIAN_BITFIELD)
> - signed long offset : 30;
> - unsigned long type : 2;
> # else
> # error "Unknown bitfield order for flat files."
> # endif
> --
> 2.20.1
>
FWIW, I wonder if keeping that type is worth bothering.
Something like
old_reloc(__be32 reloc)
{
u32 v = be32_to_cpu(reloc);
int offset, type;
#if (defined(mc68000) && !defined(CONFIG_COLDFIRE))
/* old m68k uses unusual format - type is in lower bits of octet 3 */
type = v % 4;
offset = (int)v / 4;
#else
/* everything else (including coldfire) has it in upper bits of octet 0 */
type = v >> 30;
offset = (int)(v << 2) >> 2; /* or (v & 0x1fffffff) - (v & 0x20000000) * 4 */
#endif
...
and to hell with bitfields, aliasing unions, etc. Unless I'm misreading
the whole thing, that is... Greg?
next prev parent reply other threads:[~2019-06-25 22:29 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-13 7:08 binfmt_flat cleanups and RISC-V support v2 Christoph Hellwig
2019-06-13 7:08 ` [PATCH 01/17] binfmt_flat: remove flat_reloc_valid Christoph Hellwig
2019-06-13 7:08 ` [PATCH 02/17] binfmt_flat: remove flat_set_persistent Christoph Hellwig
2019-06-13 7:08 ` [PATCH 03/17] binfmt_flat: provide a default version of flat_get_relocate_addr Christoph Hellwig
2019-06-13 7:08 ` [PATCH 04/17] binfmt_flat: remove flat_old_ram_flag Christoph Hellwig
2019-06-13 7:08 ` [PATCH 05/17] binfmt_flat: replace flat_argvp_envp_on_stack with a Kconfig variable Christoph Hellwig
2019-06-13 7:08 ` [PATCH 06/17] binfmt_flat: remove the uapi <linux/flat.h> header Christoph Hellwig
2019-06-13 7:08 ` [PATCH 07/17] binfmt_flat: remove the unused OLD_FLAT_FLAG_RAM definition Christoph Hellwig
2019-06-13 7:08 ` [PATCH 08/17] binfmt_flat: consolidate two version of flat_v2_reloc_t Christoph Hellwig
2019-06-25 22:29 ` Al Viro [this message]
2019-06-26 7:23 ` Greg Ungerer
2019-06-26 8:18 ` Geert Uytterhoeven
2019-06-26 12:14 ` Greg Ungerer
2019-06-13 7:08 ` [PATCH 09/17] binfmt_flat: use fixed size type for the on-disk format Christoph Hellwig
2019-06-13 7:08 ` [PATCH 10/17] binfmt_flat: add endianess annotations Christoph Hellwig
2019-06-13 7:08 ` [PATCH 11/17] binfmt_flat: add a ARCH_HAS_BINFMT_FLAT option Christoph Hellwig
2019-06-13 7:08 ` [PATCH 12/17] binfmt_flat: make support for old format binaries optional Christoph Hellwig
2019-06-13 7:08 ` [PATCH 13/17] binfmt_flat: provide an asm-generic/flat.h Christoph Hellwig
2019-06-13 7:09 ` [PATCH 14/17] binfmt_flat: remove the persistent argument from flat_get_addr_from_rp Christoph Hellwig
2019-06-13 7:09 ` [PATCH 15/17] binfmt_flat: move the MAX_SHARED_LIBS definition to binfmt_flat.c Christoph Hellwig
2019-06-14 8:35 ` Sergei Shtylyov
2019-06-13 7:09 ` [PATCH 16/17] binfmt_flat: don't offset the data start Christoph Hellwig
2019-06-13 7:09 ` [PATCH 17/17] riscv: add binfmt_flat support Christoph Hellwig
2019-06-13 23:38 ` binfmt_flat cleanups and RISC-V support v2 Greg Ungerer
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=20190625222941.GA1343@ZenIV.linux.org.uk \
--to=viro@zeniv.linux.org.uk \
--cc=gerg@linux-m68k.org \
--cc=hch@lst.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-c6x-dev@linux-c6x.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=linux-riscv@lists.infradead.org \
--cc=linux-sh@vger.kernel.org \
--cc=linux-xtensa@linux-xtensa.org \
--cc=monstr@monstr.eu \
--cc=uclinux-h8-devel@lists.sourceforge.jp \
/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;
as well as URLs for NNTP newsgroup(s).