Skip to content

Commit

Permalink
binfmt_flat: consolidate two version of flat_v2_reloc_t
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Christoph Hellwig authored and Greg Ungerer committed Jun 23, 2019
1 parent 38e6348 commit 3f8b76a
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions include/linux/flat.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3f8b76a

Please sign in to comment.