Commit 14cfba2e authored by Al Viro's avatar Al Viro
Browse files

Merge remote-tracking branch 'mips/mips-fixes' into work.elf-compat 

backmerge of mips compat coredump fix
parents 85f2ada7 69822245

arch/mips/boot/compressed/decompress.c

+2 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/libfdt.h>



#include <asm/addrspace.h>

#include <asm/unaligned.h>



/*

 * These two variables specify the free mem region
@@ -117,7 +118,7 @@ void decompress_kernel(unsigned long boot_heap_start) 
		dtb_size = fdt_totalsize((void *)&__appended_dtb);



		/* last four bytes is always image size in little endian */

		image_size = le32_to_cpup((void *)&__image_end - 4);

		image_size = get_unaligned_le32((void *)&__image_end - 4);



		/* copy dtb to where the booted kernel will expect it */

		memcpy((void *)VMLINUX_LOAD_ADDRESS_ULL + image_size,

arch/mips/kernel/binfmt_elfn32.c

+7 −0
Original line number Diff line number Diff line
@@ -108,4 +108,11 @@ jiffies_to_old_timeval32(unsigned long jiffies, struct old_timeval32 *value) 
#undef ns_to_kernel_old_timeval

#define ns_to_kernel_old_timeval ns_to_old_timeval32



/*

 * Some data types as stored in coredump.

 */

#define user_long_t             compat_long_t

#define user_siginfo_t          compat_siginfo_t

#define copy_siginfo_to_external        copy_siginfo_to_external32



#include "../../../fs/binfmt_elf.c"

arch/mips/kernel/binfmt_elfo32.c

+7 −0
Original line number Diff line number Diff line
@@ -110,4 +110,11 @@ jiffies_to_old_timeval32(unsigned long jiffies, struct old_timeval32 *value) 
#undef ns_to_kernel_old_timeval

#define ns_to_kernel_old_timeval ns_to_old_timeval32



/*

 * Some data types as stored in coredump.

 */

#define user_long_t             compat_long_t

#define user_siginfo_t          compat_siginfo_t

#define copy_siginfo_to_external        copy_siginfo_to_external32



#include "../../../fs/binfmt_elf.c"