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

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

um/x86: merge 32 and 64 bit variants of ptrace.h 



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

arch/x86/um/asm/ptrace.h

+54 −4
Original line number Diff line number Diff line 
#ifndef __UM_X86_PTRACE_H

#define __UM_X86_PTRACE_H



#ifdef CONFIG_X86_32

# include "ptrace_32.h"

#else

# include "ptrace_64.h"

#include <linux/compiler.h>

#ifndef CONFIG_X86_32

#define __FRAME_OFFSETS /* Needed to get the R* macros */

#endif

#include <asm/ptrace-generic.h>



#define user_mode(r) UPT_IS_USER(&(r)->regs)



#define PT_REGS_AX(r) UPT_AX(&(r)->regs)

#define PT_REGS_BX(r) UPT_BX(&(r)->regs)
@@ -36,4 +38,52 @@ static inline long regs_return_value(struct pt_regs *regs) 
{

	return PT_REGS_AX(regs);

}



/*

 * Forward declaration to avoid including sysdep/tls.h, which causes a

 * circular include, and compilation failures.

 */

struct user_desc;



#ifdef CONFIG_X86_32



#define HOST_AUDIT_ARCH AUDIT_ARCH_I386



extern int ptrace_get_thread_area(struct task_struct *child, int idx,

                                  struct user_desc __user *user_desc);



extern int ptrace_set_thread_area(struct task_struct *child, int idx,

                                  struct user_desc __user *user_desc);



#else



#define HOST_AUDIT_ARCH AUDIT_ARCH_X86_64



#define PT_REGS_R8(r) UPT_R8(&(r)->regs)

#define PT_REGS_R9(r) UPT_R9(&(r)->regs)

#define PT_REGS_R10(r) UPT_R10(&(r)->regs)

#define PT_REGS_R11(r) UPT_R11(&(r)->regs)

#define PT_REGS_R12(r) UPT_R12(&(r)->regs)

#define PT_REGS_R13(r) UPT_R13(&(r)->regs)

#define PT_REGS_R14(r) UPT_R14(&(r)->regs)

#define PT_REGS_R15(r) UPT_R15(&(r)->regs)



#include <asm/errno.h>



static inline int ptrace_get_thread_area(struct task_struct *child, int idx,

                                         struct user_desc __user *user_desc)

{

        return -ENOSYS;

}



static inline int ptrace_set_thread_area(struct task_struct *child, int idx,

                                         struct user_desc __user *user_desc)

{

        return -ENOSYS;

}



extern long arch_prctl(struct task_struct *task, int code,

		       unsigned long __user *addr);



#endif

#endif /* __UM_X86_PTRACE_H */

arch/x86/um/asm/ptrace_32.h

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
/* 

 * Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)

 * Licensed under the GPL

 */



#ifndef __UM_PTRACE_I386_H

#define __UM_PTRACE_I386_H



#define HOST_AUDIT_ARCH AUDIT_ARCH_I386



#include "linux/compiler.h"

#include "asm/ptrace-generic.h"



#define user_mode(r) UPT_IS_USER(&(r)->regs)



/*

 * Forward declaration to avoid including sysdep/tls.h, which causes a

 * circular include, and compilation failures.

 */

struct user_desc;



extern int ptrace_get_thread_area(struct task_struct *child, int idx,

                                  struct user_desc __user *user_desc);



extern int ptrace_set_thread_area(struct task_struct *child, int idx,

                                  struct user_desc __user *user_desc);



#endif

arch/x86/um/asm/ptrace_64.h

deleted100644 → 0
+0 −46
Original line number Diff line number Diff line 
/*

 * Copyright 2003 PathScale, Inc.

 *

 * Licensed under the GPL

 */



#ifndef __UM_PTRACE_X86_64_H

#define __UM_PTRACE_X86_64_H



#include "linux/compiler.h"

#include "asm/errno.h"



#define __FRAME_OFFSETS /* Needed to get the R* macros */

#include "asm/ptrace-generic.h"



#define HOST_AUDIT_ARCH AUDIT_ARCH_X86_64



#define PT_REGS_R8(r) UPT_R8(&(r)->regs)

#define PT_REGS_R9(r) UPT_R9(&(r)->regs)

#define PT_REGS_R10(r) UPT_R10(&(r)->regs)

#define PT_REGS_R11(r) UPT_R11(&(r)->regs)

#define PT_REGS_R12(r) UPT_R12(&(r)->regs)

#define PT_REGS_R13(r) UPT_R13(&(r)->regs)

#define PT_REGS_R14(r) UPT_R14(&(r)->regs)

#define PT_REGS_R15(r) UPT_R15(&(r)->regs)



/* XXX */

#define user_mode(r) UPT_IS_USER(&(r)->regs)



struct user_desc;



static inline int ptrace_get_thread_area(struct task_struct *child, int idx,

                                         struct user_desc __user *user_desc)

{

        return -ENOSYS;

}



static inline int ptrace_set_thread_area(struct task_struct *child, int idx,

                                         struct user_desc __user *user_desc)

{

        return -ENOSYS;

}



extern long arch_prctl(struct task_struct *task, int code,

		       unsigned long __user *addr);

#endif