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

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

backmerge of mips compat coredump fix
parents 85f2ada7 69822245
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <linux/libfdt.h> #include <linux/libfdt.h>
#include <asm/addrspace.h> #include <asm/addrspace.h>
#include <asm/unaligned.h>
/* /*
* These two variables specify the free mem region * These two variables specify the free mem region
...@@ -117,7 +118,7 @@ void decompress_kernel(unsigned long boot_heap_start) ...@@ -117,7 +118,7 @@ void decompress_kernel(unsigned long boot_heap_start)
dtb_size = fdt_totalsize((void *)&__appended_dtb); dtb_size = fdt_totalsize((void *)&__appended_dtb);
/* last four bytes is always image size in little endian */ /* 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 */ /* copy dtb to where the booted kernel will expect it */
memcpy((void *)VMLINUX_LOAD_ADDRESS_ULL + image_size, memcpy((void *)VMLINUX_LOAD_ADDRESS_ULL + image_size,
......
...@@ -108,4 +108,11 @@ jiffies_to_old_timeval32(unsigned long jiffies, struct old_timeval32 *value) ...@@ -108,4 +108,11 @@ jiffies_to_old_timeval32(unsigned long jiffies, struct old_timeval32 *value)
#undef ns_to_kernel_old_timeval #undef ns_to_kernel_old_timeval
#define ns_to_kernel_old_timeval ns_to_old_timeval32 #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" #include "../../../fs/binfmt_elf.c"
...@@ -110,4 +110,11 @@ jiffies_to_old_timeval32(unsigned long jiffies, struct old_timeval32 *value) ...@@ -110,4 +110,11 @@ jiffies_to_old_timeval32(unsigned long jiffies, struct old_timeval32 *value)
#undef ns_to_kernel_old_timeval #undef ns_to_kernel_old_timeval
#define ns_to_kernel_old_timeval ns_to_old_timeval32 #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" #include "../../../fs/binfmt_elf.c"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment