Commit b123923d authored by Paul Mackerras's avatar Paul Mackerras
Browse files

powerpc: Move ptrace32.c from arch/ppc64 to arch/powerpc 



Also corrected my email address in ptrace.c and updated the comments
at the top of ptrace32.c.

Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 9b7cf8b4

arch/powerpc/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ endif 


obj-y				:= semaphore.o cputable.o ptrace.o syscalls.o \

				   signal_32.o

obj-$(CONFIG_PPC64)		+= binfmt_elf32.o sys_ppc32.o

obj-$(CONFIG_PPC64)		+= binfmt_elf32.o sys_ppc32.o ptrace32.o

obj-$(CONFIG_ALTIVEC)		+= vecemu.o vector.o

obj-$(CONFIG_POWER4)		+= idle_power4.o

obj-$(CONFIG_PPC_OF)		+= of_device.o

arch/powerpc/kernel/ptrace.c

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
 *  linux/kernel/ptrace.c is by Ross Biro 1/23/92, edited by Linus Torvalds

 *

 * Modified by Cort Dougan (cort@hq.fsmlabs.com)

 * and Paul Mackerras (paulus@linuxcare.com.au).

 * and Paul Mackerras (paulus@samba.org).

 *

 * This file is subject to the terms and conditions of the GNU General

 * Public License.  See the file README.legal in the main directory of

arch/ppc64/kernel/ptrace32.c→arch/powerpc/kernel/ptrace32.c

+5 −4
Original line number Diff line number Diff line 
/*

 *  linux/arch/ppc64/kernel/ptrace32.c

 * ptrace for 32-bit processes running on a 64-bit kernel.

 *

 *  PowerPC version

 *    Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org)
@@ -10,10 +10,10 @@ 
 *  linux/kernel/ptrace.c is by Ross Biro 1/23/92, edited by Linus Torvalds

 *

 * Modified by Cort Dougan (cort@hq.fsmlabs.com)

 * and Paul Mackerras (paulus@linuxcare.com.au).

 * and Paul Mackerras (paulus@samba.org).

 *

 * This file is subject to the terms and conditions of the GNU General

 * Public License.  See the file README.legal in the main directory of

 * Public License.  See the file COPYING in the main directory of

 * this archive for more details.

 */
@@ -40,7 +40,8 @@ 
 * in exit.c or in signal.c.

 */



int compat_sys_ptrace(long request, long pid, unsigned long addr, unsigned long data)

int compat_sys_ptrace(int request, int pid, unsigned long addr,

		      unsigned long data)

{

	struct task_struct *child;

	int ret = -EPERM;

arch/ppc64/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ obj-y += irq.o idle.o dma.o \ 
			time.o signal.o \

			align.o bitops.o pacaData.o \

			udbg.o ioctl32.o \

			ptrace32.o rtc.o \

			rtc.o \

			cpu_setup_power4.o \

			iommu.o sysfs.o vdso.o pmc.o firmware.o

obj-y += vdso32/ vdso64/