mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
um: kill includes of sysdep/sigcontext.h from stuff built with kernel headers
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
parent
51d3474905
commit
adcfb9852d
8 changed files with 14 additions and 22 deletions
|
@ -11,7 +11,6 @@
|
|||
#include <asm/unistd.h>
|
||||
#include "frame_kern.h"
|
||||
#include "kern_util.h"
|
||||
#include <sysdep/sigcontext.h>
|
||||
|
||||
EXPORT_SYMBOL(block_signals);
|
||||
EXPORT_SYMBOL(unblock_signals);
|
||||
|
|
|
@ -14,7 +14,6 @@
|
|||
#include "kern_util.h"
|
||||
#include "os.h"
|
||||
#include "skas.h"
|
||||
#include "sysdep/sigcontext.h"
|
||||
|
||||
/*
|
||||
* Note this is constrained to return 0, -EFAULT, -EACCESS, -ENOMEM by
|
||||
|
|
|
@ -24,6 +24,12 @@ struct faultinfo {
|
|||
#define FAULT_WRITE(fi) ((fi).error_code & 2)
|
||||
#define FAULT_ADDRESS(fi) ((fi).cr2)
|
||||
|
||||
/* This is Page Fault */
|
||||
#define SEGV_IS_FIXABLE(fi) ((fi)->trap_no == 14)
|
||||
|
||||
/* SKAS3 has no trap_no on i386, but get_skas_faultinfo() sets it to 0. */
|
||||
#define SEGV_MAYBE_FIXABLE(fi) ((fi)->trap_no == 0 && ptrace_faultinfo)
|
||||
|
||||
#define PTRACE_FULL_FAULTINFO 0
|
||||
|
||||
#endif
|
||||
|
|
|
@ -24,6 +24,12 @@ struct faultinfo {
|
|||
#define FAULT_WRITE(fi) ((fi).error_code & 2)
|
||||
#define FAULT_ADDRESS(fi) ((fi).cr2)
|
||||
|
||||
/* This is Page Fault */
|
||||
#define SEGV_IS_FIXABLE(fi) ((fi)->trap_no == 14)
|
||||
|
||||
/* No broken SKAS API, which doesn't pass trap_no, here. */
|
||||
#define SEGV_MAYBE_FIXABLE(fi) 0
|
||||
|
||||
#define PTRACE_FULL_FAULTINFO 1
|
||||
|
||||
#endif
|
||||
|
|
|
@ -43,6 +43,7 @@ extern int sysemu_supported;
|
|||
|
||||
#define REGS_SET_SYSCALL_RETURN(r, res) REGS_EAX(r) = (res)
|
||||
|
||||
#define IP_RESTART_SYSCALL(ip) ((ip) -= 2)
|
||||
#define REGS_RESTART_SYSCALL(r) IP_RESTART_SYSCALL(REGS_IP(r))
|
||||
|
||||
#ifndef PTRACE_SYSEMU_SINGLESTEP
|
||||
|
|
|
@ -69,10 +69,9 @@
|
|||
|
||||
#define REGS_SET_SYSCALL_RETURN(r, res) REGS_RAX(r) = (res)
|
||||
|
||||
#define IP_RESTART_SYSCALL(ip) ((ip) -= 2)
|
||||
#define REGS_RESTART_SYSCALL(r) IP_RESTART_SYSCALL(REGS_IP(r))
|
||||
|
||||
#define REGS_SEGV_IS_FIXABLE(r) SEGV_IS_FIXABLE((r)->trap_type)
|
||||
|
||||
#define REGS_FAULT_ADDR(r) ((r)->fault_addr)
|
||||
|
||||
#define REGS_FAULT_WRITE(r) FAULT_WRITE((r)->fault_type)
|
||||
|
@ -152,8 +151,6 @@ struct syscall_args {
|
|||
|
||||
#define UPT_RESTART_SYSCALL(r) REGS_RESTART_SYSCALL((r)->gp)
|
||||
|
||||
#define UPT_SEGV_IS_FIXABLE(r) REGS_SEGV_IS_FIXABLE(&r->skas)
|
||||
|
||||
#define UPT_FAULTINFO(r) (&(r)->faultinfo)
|
||||
|
||||
static inline void arch_init_registers(int pid)
|
||||
|
|
|
@ -8,8 +8,6 @@
|
|||
|
||||
#include <generated/user_constants.h>
|
||||
|
||||
#define IP_RESTART_SYSCALL(ip) ((ip) -= 2)
|
||||
|
||||
#define SC_OFFSET(sc, field) \
|
||||
*((unsigned long *) &(((char *) (sc))[HOST_##field]))
|
||||
|
||||
|
@ -24,10 +22,4 @@
|
|||
(fi).trap_no = SC_TRAPNO(sc); \
|
||||
}
|
||||
|
||||
/* This is Page Fault */
|
||||
#define SEGV_IS_FIXABLE(fi) ((fi)->trap_no == 14)
|
||||
|
||||
/* SKAS3 has no trap_no on i386, but get_skas_faultinfo() sets it to 0. */
|
||||
#define SEGV_MAYBE_FIXABLE(fi) ((fi)->trap_no == 0 && ptrace_faultinfo)
|
||||
|
||||
#endif
|
||||
|
|
|
@ -15,8 +15,6 @@
|
|||
#define SC_ERR(sc) SC_OFFSET(sc, SC_ERR)
|
||||
#define SC_TRAPNO(sc) SC_OFFSET(sc, SC_TRAPNO)
|
||||
|
||||
#define IP_RESTART_SYSCALL(ip) ((ip) -= 2)
|
||||
|
||||
#define GET_FAULTINFO_FROM_SC(fi, sc) \
|
||||
{ \
|
||||
(fi).cr2 = SC_CR2(sc); \
|
||||
|
@ -24,10 +22,4 @@
|
|||
(fi).trap_no = SC_TRAPNO(sc); \
|
||||
}
|
||||
|
||||
/* This is Page Fault */
|
||||
#define SEGV_IS_FIXABLE(fi) ((fi)->trap_no == 14)
|
||||
|
||||
/* No broken SKAS API, which doesn't pass trap_no, here. */
|
||||
#define SEGV_MAYBE_FIXABLE(fi) 0
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue