ptrace: conditionalize compat_ptrace_request
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/1 ptrace: conditionalize compat_ptrace_request
My recent additions to compat_ptrace_request made it mandatory for CONFIG_COMPAT arch's to define copy_siginfo_from_user32. This broke some builds, though they all really should get cleaned up in that way.
Since all the arch's that actually call compat_ptrace_request have now been cleaned up to use the generic compat_sys_ptrace, we can avoid the build problems on the crufty arch's by changing the conditionals on the definition.
Signed-off-by Roland McGrath <[email protected]>
--- kernel/ptrace.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-)
kernel/ptrace.c +2 -5
@@ -612,7 +612,7 @@ int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data)return (copied ==sizeof (data)) ?0 : -EIO ; } -#ifdef CONFIG_COMPAT +#if definedCONFIG_COMPAT && defined __ARCH_WANT_COMPAT_SYS_PTRACE#include <linux/compat.h> int compat_ptrace_request(struct task_struct *child, compat_long_t request,
@@ -667,7 +667,6 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request,return ret; } -#ifdef __ARCH_WANT_COMPAT_SYS_PTRACEasmlinkage long compat_sys_ptrace (compat_long_t request,compat_long_t pid,compat_long_t addr,compat_long_t data) {
@@ -710,6 +709,4 @@ asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,unlock_kernel (); return ret; } -#endif /* __ARCH_WANT_COMPAT_SYS_PTRACE */ - -#endif /* CONFIG_COMPAT */ +#endif /* CONFIG_COMPAT && __ARCH_WANT_COMPAT_SYS_PTRACE */