History

Merge tag 'mips_fixes_5.1_1' into mips-next

A small batch of MIPS fixes for 5.1: - An interrupt masking fix for Loongson-based Lemote 2F systems (fixing a regression from v3.19). - A relocation fix for configurations in which the devicetree is stored in an ELF section (fixing a regression from v4.7). - Fix jump labels for MIPSr6 kernels where they previously could inadvertently place a control transfer instruction in a forbidden slot & take unexpected exceptions (fixing MIPSr6 support added in v4.0). - Extend an existing USB power workaround for the Netgear WNDR3400 to v2 boards in addition to the v3 ones that already used it. - Remove the custom MIPS32 definition of __kernel_fsid_t to make it consistent with MIPS64 & every other architecture, in particular resolving issues for code which tries to print the val field whose type previously differed (though had identical memory layout). Merged into mips-next to gain the MIPSr6 jump label fix before enabling jump labels by default for generic kernel builds.

Paul Burton committed 7 years ago

Commit ec86e542 parents e6046b5 f6cab795 files · +13 −17Browse files

Showing the changes to arch/mips/include/uapi (1 of 5 files). Show all

Unified · Split

arch/mips/include/uapi/asm/posix_types.h+0−7
@@ -21,13 +21,6 @@ · 20 unmodified lines
2121 typedef long __kernel_daddr_t;
2222 #define __kernel_daddr_t __kernel_daddr_t
2323
24−#if (_MIPS_SZLONG == 32)
25−typedef struct {
26− long val[2];
27−} __kernel_fsid_t;
28−#define __kernel_fsid_t __kernel_fsid_t
29−#endif
30−
3124 #include <asm-generic/posix_types.h>
3225
3326 #endif /* _ASM_POSIX_TYPES_H */