Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit adcfb985 authored by Al Viro's avatar Al Viro Committed by Richard Weinberger
Browse files

um: kill includes of sysdep/sigcontext.h from stuff built with kernel headers 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 51d34749

arch/um/kernel/signal.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

arch/um/kernel/trap.c

+0 −1
Original line number Diff line number Diff line
@@ -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

arch/um/sys-x86/shared/sysdep/faultinfo_32.h

+6 −0
Original line number Diff line number Diff line
@@ -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

arch/um/sys-x86/shared/sysdep/faultinfo_64.h

+6 −0
Original line number Diff line number Diff line
@@ -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

arch/um/sys-x86/shared/sysdep/ptrace_32.h

+1 −0
Original line number Diff line number Diff line
@@ -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