diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-08 16:38:42 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-08 16:38:42 -0400 |
commit | 601e7f024edbea8018de34c83a7398623214e636 (patch) | |
tree | 080fe3301f22374f0caba265bf3e1541d86d3366 /scripts/mod/modpost.h | |
parent | 6810b548b25114607e0814612d84125abccc0a4f (diff) |
Revert "kbuild: fix modpost segfault for 64bit mipsel kernel"
This reverts commit c8d8b837ebe4b4f11e1b0c4a2bdc358c697692ed, which
caused problems for the x86 build. Quoth Sam:
"It was discussed on mips list but apparently the fix was bogus. I
will not have time to look into it so mips can carry this local fix
until we get a proper fix in mainline."
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'scripts/mod/modpost.h')
-rw-r--r-- | scripts/mod/modpost.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h index 89b96c6d8ef5..b14255c72a37 100644 --- a/scripts/mod/modpost.h +++ b/scripts/mod/modpost.h | |||
@@ -39,25 +39,6 @@ | |||
39 | #define ELF_R_TYPE ELF64_R_TYPE | 39 | #define ELF_R_TYPE ELF64_R_TYPE |
40 | #endif | 40 | #endif |
41 | 41 | ||
42 | /* The 64-bit MIPS ELF ABI uses an unusual reloc format. */ | ||
43 | typedef struct | ||
44 | { | ||
45 | Elf32_Word r_sym; /* Symbol index */ | ||
46 | unsigned char r_ssym; /* Special symbol for 2nd relocation */ | ||
47 | unsigned char r_type3; /* 3rd relocation type */ | ||
48 | unsigned char r_type2; /* 2nd relocation type */ | ||
49 | unsigned char r_type1; /* 1st relocation type */ | ||
50 | } _Elf64_Mips_R_Info; | ||
51 | |||
52 | typedef union | ||
53 | { | ||
54 | Elf64_Xword r_info_number; | ||
55 | _Elf64_Mips_R_Info r_info_fields; | ||
56 | } _Elf64_Mips_R_Info_union; | ||
57 | |||
58 | #define ELF64_MIPS_R_SYM(i) \ | ||
59 | ((__extension__ (_Elf64_Mips_R_Info_union)(i)).r_info_fields.r_sym) | ||
60 | |||
61 | #if KERNEL_ELFDATA != HOST_ELFDATA | 42 | #if KERNEL_ELFDATA != HOST_ELFDATA |
62 | 43 | ||
63 | static inline void __endian(const void *src, void *dest, unsigned int size) | 44 | static inline void __endian(const void *src, void *dest, unsigned int size) |