Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
authored by
Christoph Hellwig
and committed by
Greg Ungerer
3f8b76a6
38e63483
+2
-4
+2
-4
include/linux/flat.h
+2
-4
include/linux/flat.h
···
69
69
typedef union {
70
70
unsigned long value;
71
71
struct {
72
-
# if defined(mc68000) && !defined(CONFIG_COLDFIRE)
72
+
#if defined(__LITTLE_ENDIAN_BITFIELD) || \
73
+
(defined(mc68000) && !defined(CONFIG_COLDFIRE))
73
74
signed long offset : 30;
74
75
unsigned long type : 2;
75
76
# elif defined(__BIG_ENDIAN_BITFIELD)
76
77
unsigned long type : 2;
77
78
signed long offset : 30;
78
-
# elif defined(__LITTLE_ENDIAN_BITFIELD)
79
-
signed long offset : 30;
80
-
unsigned long type : 2;
81
79
# else
82
80
# error "Unknown bitfield order for flat files."
83
81
# endif