renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-28 23:23:55 +08:00
Code

binfmt_flat: consolidate two version of flat_v2_reloc_t

Browse Source 
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>
This commit is contained in:
Christoph Hellwig 2019-06-13 09:08:54 +02:00 committed by Greg Ungerer
parent 38e63483a3
commit 3f8b76a66e
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/flat.h
View File

@ -69,15 +69,13 @@ struct flat_hdr {
typedef union { typedef union {
unsigned long value; unsigned long value;
struct { struct {
# if defined(mc68000) && !defined(CONFIG_COLDFIRE) #if defined(__LITTLE_ENDIAN_BITFIELD) || \
(defined(mc68000) && !defined(CONFIG_COLDFIRE))
signed long offset : 30; signed long offset : 30;
unsigned long type : 2; unsigned long type : 2;
# elif defined(__BIG_ENDIAN_BITFIELD) # elif defined(__BIG_ENDIAN_BITFIELD)
unsigned long type : 2; unsigned long type : 2;
signed long offset : 30; signed long offset : 30;
# elif defined(__LITTLE_ENDIAN_BITFIELD)
signed long offset : 30;
unsigned long type : 2;
# else # else
# error "Unknown bitfield order for flat files." # error "Unknown bitfield order for flat files."
# endif # endif