You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x32 support for x86-64 from Ingo Molnar:
"This tree introduces the X32 binary format and execution mode for x86:
32-bit data space binaries using 64-bit instructions and 64-bit kernel
syscalls.
This allows applications whose working set fits into a 32 bits address
space to make use of 64-bit instructions while using a 32-bit address
space with shorter pointers, more compressed data structures, etc."
Fix up trivial context conflicts in arch/x86/{Kconfig,vdso/vma.c}
* 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (71 commits)
x32: Fix alignment fail in struct compat_siginfo
x32: Fix stupid ia32/x32 inversion in the siginfo format
x32: Add ptrace for x32
x32: Switch to a 64-bit clock_t
x32: Provide separate is_ia32_task() and is_x32_task() predicates
x86, mtrr: Use explicit sizing and padding for the 64-bit ioctls
x86/x32: Fix the binutils auto-detect
x32: Warn and disable rather than error if binutils too old
x32: Only clear TIF_X32 flag once
x32: Make sure TS_COMPAT is cleared for x32 tasks
fs: Remove missed ->fds_bits from cessation use of fd_set structs internally
fs: Fix close_on_exec pointer in alloc_fdtable
x32: Drop non-__vdso weak symbols from the x32 VDSO
x32: Fix coding style violations in the x32 VDSO code
x32: Add x32 VDSO support
x32: Allow x32 to be configured
x32: If configured, add x32 system calls to system call tables
x32: Handle process creation
x32: Signal-related system calls
x86: Add #ifdef CONFIG_COMPAT to <asm/sys_ia32.h>
...
This commit is contained in:
+20
-4
@@ -1415,6 +1415,22 @@ static void do_thread_regset_writeback(struct task_struct *task,
|
||||
regset->writeback(task, regset, 1);
|
||||
}
|
||||
|
||||
#ifndef PR_REG_SIZE
|
||||
#define PR_REG_SIZE(S) sizeof(S)
|
||||
#endif
|
||||
|
||||
#ifndef PRSTATUS_SIZE
|
||||
#define PRSTATUS_SIZE(S) sizeof(S)
|
||||
#endif
|
||||
|
||||
#ifndef PR_REG_PTR
|
||||
#define PR_REG_PTR(S) (&((S)->pr_reg))
|
||||
#endif
|
||||
|
||||
#ifndef SET_PR_FPVALID
|
||||
#define SET_PR_FPVALID(S, V) ((S)->pr_fpvalid = (V))
|
||||
#endif
|
||||
|
||||
static int fill_thread_core_info(struct elf_thread_core_info *t,
|
||||
const struct user_regset_view *view,
|
||||
long signr, size_t *total)
|
||||
@@ -1429,11 +1445,11 @@ static int fill_thread_core_info(struct elf_thread_core_info *t,
|
||||
*/
|
||||
fill_prstatus(&t->prstatus, t->task, signr);
|
||||
(void) view->regsets[0].get(t->task, &view->regsets[0],
|
||||
0, sizeof(t->prstatus.pr_reg),
|
||||
&t->prstatus.pr_reg, NULL);
|
||||
0, PR_REG_SIZE(t->prstatus.pr_reg),
|
||||
PR_REG_PTR(&t->prstatus), NULL);
|
||||
|
||||
fill_note(&t->notes[0], "CORE", NT_PRSTATUS,
|
||||
sizeof(t->prstatus), &t->prstatus);
|
||||
PRSTATUS_SIZE(t->prstatus), &t->prstatus);
|
||||
*total += notesize(&t->notes[0]);
|
||||
|
||||
do_thread_regset_writeback(t->task, &view->regsets[0]);
|
||||
@@ -1463,7 +1479,7 @@ static int fill_thread_core_info(struct elf_thread_core_info *t,
|
||||
regset->core_note_type,
|
||||
size, data);
|
||||
else {
|
||||
t->prstatus.pr_fpvalid = 1;
|
||||
SET_PR_FPVALID(&t->prstatus, 1);
|
||||
fill_note(&t->notes[i], "CORE",
|
||||
NT_PRFPREG, size, data);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user