Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
14cfba2e
Commit
14cfba2e
authored
Jan 06, 2021
by
Al Viro
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'mips/mips-fixes' into work.elf-compat
backmerge of mips compat coredump fix
parents
85f2ada7
69822245
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
1 deletion
+16
-1
arch/mips/boot/compressed/decompress.c
arch/mips/boot/compressed/decompress.c
+2
-1
arch/mips/kernel/binfmt_elfn32.c
arch/mips/kernel/binfmt_elfn32.c
+7
-0
arch/mips/kernel/binfmt_elfo32.c
arch/mips/kernel/binfmt_elfo32.c
+7
-0
No files found.
arch/mips/boot/compressed/decompress.c
View file @
14cfba2e
...
...
@@ -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
View file @
14cfba2e
...
...
@@ -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
View file @
14cfba2e
...
...
@@ -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"
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment