hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

x86, um: trim the junk from uml ptrace-*.h 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
Al Viro 2008-08-18 17:47:45 -04:00 committed by H. Peter Anvin
parent 2985cfdb04
commit 17dcf75d3e
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/um/include/asm/ptrace-i386.h
View File

@ -10,8 +10,6 @@
#include "linux/compiler.h" #include "linux/compiler.h"
#include "asm/ptrace-generic.h" #include "asm/ptrace-generic.h"
#include <asm/user.h>
#include "sysdep/ptrace.h"
#define PT_REGS_EAX(r) UPT_EAX(&(r)->regs) #define PT_REGS_EAX(r) UPT_EAX(&(r)->regs)
#define PT_REGS_EBX(r) UPT_EBX(&(r)->regs) #define PT_REGS_EBX(r) UPT_EBX(&(r)->regs)
@ -34,8 +32,6 @@
#define PT_REGS_SYSCALL_RET(r) PT_REGS_EAX(r) #define PT_REGS_SYSCALL_RET(r) PT_REGS_EAX(r)
#define PT_FIX_EXEC_STACK(sp) do ; while(0) #define PT_FIX_EXEC_STACK(sp) do ; while(0)
/* Cope with a conditional i386 definition. */
#undef profile_pc
#define profile_pc(regs) PT_REGS_IP(regs) #define profile_pc(regs) PT_REGS_IP(regs)
#define user_mode(r) UPT_IS_USER(&(r)->regs) #define user_mode(r) UPT_IS_USER(&(r)->regs)

13
arch/um/include/asm/ptrace-x86_64.h
View File

@ -9,23 +9,12 @@
#include "linux/compiler.h" #include "linux/compiler.h"
#include "asm/errno.h" #include "asm/errno.h"
#include <sysdep/host_ldt.h>
#define __FRAME_OFFSETS /* Needed to get the R* macros */ #define __FRAME_OFFSETS /* Needed to get the R* macros */
#include "asm/ptrace-generic.h" #include "asm/ptrace-generic.h"
#define HOST_AUDIT_ARCH AUDIT_ARCH_X86_64 #define HOST_AUDIT_ARCH AUDIT_ARCH_X86_64
/* Also defined in sysdep/ptrace.h, so may already be defined. */
#ifndef FS_BASE
#define FS_BASE (21 * sizeof(unsigned long))
#define GS_BASE (22 * sizeof(unsigned long))
#define DS (23 * sizeof(unsigned long))
#define ES (24 * sizeof(unsigned long))
#define FS (25 * sizeof(unsigned long))
#define GS (26 * sizeof(unsigned long))
#endif
#define PT_REGS_RBX(r) UPT_RBX(&(r)->regs) #define PT_REGS_RBX(r) UPT_RBX(&(r)->regs)
#define PT_REGS_RCX(r) UPT_RCX(&(r)->regs) #define PT_REGS_RCX(r) UPT_RCX(&(r)->regs)
#define PT_REGS_RDX(r) UPT_RDX(&(r)->regs) #define PT_REGS_RDX(r) UPT_RDX(&(r)->regs)
@ -64,6 +53,8 @@
#define profile_pc(regs) PT_REGS_IP(regs) #define profile_pc(regs) PT_REGS_IP(regs)
struct user_desc;
static inline int ptrace_get_thread_area(struct task_struct *child, int idx, static inline int ptrace_get_thread_area(struct task_struct *child, int idx,
struct user_desc __user *user_desc) struct user_desc __user *user_desc)
{ {