diff options
| author |   Christoph Hellwig <hch@lst.de> | 2019-06-13 09:08:54 +0200 |
|---|---|---|
| committer |   Greg Ungerer <gerg@kernel.org> | 2019-06-24 09:16:46 +1000 |
| commit | 3f8b76a66e0d49e3afaba595b9762c126448e783 (patch) | |
| tree | 0d1bf5f06bff37e55a3ac7b78f5a99444211e397 | |
| parent | binfmt_flat: remove the unused OLD_FLAT_FLAG_RAM definition (diff) | |
| download | linux-dev-3f8b76a66e0d49e3afaba595b9762c126448e783.tar.xz linux-dev-3f8b76a66e0d49e3afaba595b9762c126448e783.zip | |
binfmt_flat: consolidate two version of flat_v2_reloc_t
Two branches of the ifdef maze actually have the same content, so merge
them.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>
| -rw-r--r-- | include/linux/flat.h | 6 |
1 files 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 |