AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-24 06:40:54 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove __ARCH_WANT_COMPAT_SYS_PTRACE

Browse Source 
All architectures now use the generic compat_sys_ptrace, as should every
new architecture that needs 32bit compat (if we'll ever get another).

Remove the now superflous __ARCH_WANT_COMPAT_SYS_PTRACE define, and also
kill a comment about __ARCH_SYS_PTRACE that was added after
__ARCH_SYS_PTRACE was already gone.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Christoph Hellwig 2008-11-25 08:10:03 +01:00 committed by Linus Torvalds
parent 16799c6a4d
commit 96b8936a9e
10 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/Kconfig
View File

@ -79,8 +79,6 @@ config HAVE_KRETPROBES
# task_pt_regs() in asm/processor.h or asm/ptrace.h # task_pt_regs() in asm/processor.h or asm/ptrace.h
# arch_has_single_step() if there is hardware single-step support # arch_has_single_step() if there is hardware single-step support
# arch_has_block_step() if there is hardware block-step support # arch_has_block_step() if there is hardware block-step support
# arch_ptrace() and not #define __ARCH_SYS_PTRACE
# compat_arch_ptrace() and #define __ARCH_WANT_COMPAT_SYS_PTRACE
# asm/syscall.h supplying asm-generic/syscall.h interface # asm/syscall.h supplying asm-generic/syscall.h interface
# linux/regset.h user_regset interfaces # linux/regset.h user_regset interfaces
# CORE_DUMP_USE_REGSET #define'd in linux/elf.h # CORE_DUMP_USE_REGSET #define'd in linux/elf.h

2
arch/ia64/include/asm/ptrace.h
View File

@ -325,8 +325,6 @@ static inline unsigned long user_stack_pointer(struct pt_regs *regs)
#define arch_has_block_step() (1) #define arch_has_block_step() (1)
extern void user_enable_block_step(struct task_struct *); extern void user_enable_block_step(struct task_struct *);
#define __ARCH_WANT_COMPAT_SYS_PTRACE
#endif /* !__KERNEL__ */ #endif /* !__KERNEL__ */
/* pt_all_user_regs is used for PTRACE_GETREGS PTRACE_SETREGS */ /* pt_all_user_regs is used for PTRACE_GETREGS PTRACE_SETREGS */

4
arch/mips/include/asm/ptrace.h
View File

@ -9,10 +9,6 @@
#ifndef _ASM_PTRACE_H #ifndef _ASM_PTRACE_H
#define _ASM_PTRACE_H #define _ASM_PTRACE_H
#ifdef CONFIG_64BIT
#define __ARCH_WANT_COMPAT_SYS_PTRACE
#endif
/* 0 - 31 are integer registers, 32 - 63 are fp registers. */ /* 0 - 31 are integer registers, 32 - 63 are fp registers. */
#define FPR_BASE 32 #define FPR_BASE 32
#define PC 64 #define PC 64

2
arch/parisc/include/asm/ptrace.h
View File

@ -47,8 +47,6 @@ struct pt_regs {
#define task_regs(task) ((struct pt_regs *) ((char *)(task) + TASK_REGS)) #define task_regs(task) ((struct pt_regs *) ((char *)(task) + TASK_REGS))
#define __ARCH_WANT_COMPAT_SYS_PTRACE
struct task_struct; struct task_struct;
#define arch_has_single_step() 1 #define arch_has_single_step() 1
void user_disable_single_step(struct task_struct *task); void user_disable_single_step(struct task_struct *task);

2
arch/powerpc/include/asm/ptrace.h
View File

@ -55,8 +55,6 @@ struct pt_regs {
#ifdef __powerpc64__ #ifdef __powerpc64__
#define __ARCH_WANT_COMPAT_SYS_PTRACE
#define STACK_FRAME_OVERHEAD 112 /* size of minimum stack frame */ #define STACK_FRAME_OVERHEAD 112 /* size of minimum stack frame */
#define STACK_FRAME_LR_SAVE 2 /* Location of LR in stack frame */ #define STACK_FRAME_LR_SAVE 2 /* Location of LR in stack frame */
#define STACK_FRAME_REGS_MARKER ASM_CONST(0x7265677368657265) #define STACK_FRAME_REGS_MARKER ASM_CONST(0x7265677368657265)

2
arch/s390/include/asm/ptrace.h
View File

@ -486,8 +486,6 @@ struct task_struct;
extern void user_enable_single_step(struct task_struct *); extern void user_enable_single_step(struct task_struct *);
extern void user_disable_single_step(struct task_struct *); extern void user_disable_single_step(struct task_struct *);
#define __ARCH_WANT_COMPAT_SYS_PTRACE
#define user_mode(regs) (((regs)->psw.mask & PSW_MASK_PSTATE) != 0) #define user_mode(regs) (((regs)->psw.mask & PSW_MASK_PSTATE) != 0)
#define instruction_pointer(regs) ((regs)->psw.addr & PSW_ADDR_INSN) #define instruction_pointer(regs) ((regs)->psw.addr & PSW_ADDR_INSN)
#define user_stack_pointer(regs)((regs)->gprs[15]) #define user_stack_pointer(regs)((regs)->gprs[15])

2
arch/sparc/include/asm/ptrace_64.h
View File

@ -142,8 +142,6 @@ struct global_reg_snapshot {
}; };
extern struct global_reg_snapshot global_reg_snapshot[NR_CPUS]; extern struct global_reg_snapshot global_reg_snapshot[NR_CPUS];
#define __ARCH_WANT_COMPAT_SYS_PTRACE
#define force_successful_syscall_return() \ #define force_successful_syscall_return() \
do { current_thread_info()->syscall_noerror = 1; \ do { current_thread_info()->syscall_noerror = 1; \
} while (0) } while (0)

2
arch/x86/include/asm/ptrace.h
View File

@ -271,8 +271,6 @@ extern int do_get_thread_area(struct task_struct *p, int idx,
extern int do_set_thread_area(struct task_struct *p, int idx, extern int do_set_thread_area(struct task_struct *p, int idx,
struct user_desc __user *info, int can_allocate); struct user_desc __user *info, int can_allocate);
#define __ARCH_WANT_COMPAT_SYS_PTRACE
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLY__ */

2
include/linux/compat.h
View File

@ -252,12 +252,10 @@ extern int compat_ptrace_request(struct task_struct *child,
compat_long_t request, compat_long_t request,
compat_ulong_t addr, compat_ulong_t data); compat_ulong_t addr, compat_ulong_t data);
#ifdef __ARCH_WANT_COMPAT_SYS_PTRACE
extern long compat_arch_ptrace(struct task_struct *child, compat_long_t request, extern long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
compat_ulong_t addr, compat_ulong_t data); compat_ulong_t addr, compat_ulong_t data);
asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid, asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
compat_long_t addr, compat_long_t data); compat_long_t addr, compat_long_t data);
#endif /* __ARCH_WANT_COMPAT_SYS_PTRACE */
/* /*
* epoll (fs/eventpoll.c) compat bits follow ... * epoll (fs/eventpoll.c) compat bits follow ...

4
kernel/ptrace.c
View File

@ -612,7 +612,7 @@ int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data)
return (copied == sizeof(data)) ? 0 : -EIO; return (copied == sizeof(data)) ? 0 : -EIO;
} }
#if defined CONFIG_COMPAT && defined __ARCH_WANT_COMPAT_SYS_PTRACE #if defined CONFIG_COMPAT
#include <linux/compat.h> #include <linux/compat.h>
int compat_ptrace_request(struct task_struct *child, compat_long_t request, int compat_ptrace_request(struct task_struct *child, compat_long_t request,
@ -709,4 +709,4 @@ asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
unlock_kernel(); unlock_kernel();
return ret; return ret;
} }
#endif /* CONFIG_COMPAT && __ARCH_WANT_COMPAT_SYS_PTRACE */ #endif /* CONFIG_COMPAT */