Commit 9d04d928 authored by Roland McGrath's avatar Roland McGrath Committed by Linus Torvalds
Browse files

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: default avatarRoland McGrath <roland@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e97e386b

kernel/ptrace.c

+2 −5
Original line number Original line Diff line number Diff line
@@ -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;

}

}





#ifdef CONFIG_COMPAT

#if defined CONFIG_COMPAT && defined __ARCH_WANT_COMPAT_SYS_PTRACE

#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,
@@ -667,7 +667,6 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request, 
	return ret;

	return ret;

}

}





#ifdef __ARCH_WANT_COMPAT_SYS_PTRACE

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)

{

{
@@ -710,6 +709,4 @@ asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid, 
	unlock_kernel();

	unlock_kernel();

	return ret;

	return ret;

}

}

#endif /* __ARCH_WANT_COMPAT_SYS_PTRACE */

#endif	/* CONFIG_COMPAT && __ARCH_WANT_COMPAT_SYS_PTRACE */
 


#endif	/* CONFIG_COMPAT */

CRA Git | Maintained and supported by SUSTech CRA and CCSE