From: Christoph Hellwig <hch@lst.de>
Date: Thu, 13 Jun 2019 07:08:54 +0000 (+0200)
Subject: binfmt_flat: consolidate two version of flat_v2_reloc_t
X-Git-Tag: v5.3-rc1~144^2~9
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=3f8b76a66e0d49e3afaba595b9762c126448e783;p=linux-2.6-block.git

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>
---

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