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

Commit cbc9d9d9 authored by Roland McGrath's avatar Roland McGrath Committed by Ingo Molnar
Browse files

x86: x86 ptrace merge complete 



This switches over the 64-bit build to use the shared ptrace code,
instead of the old ptrace_64.c and arch/x86/ia32/ptrace32.c code.

Signed-off-by: default avatarRoland McGrath <roland@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 099cd6e9

arch/x86/ia32/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#



obj-$(CONFIG_IA32_EMULATION) := ia32entry.o sys_ia32.o ia32_signal.o \

	ia32_binfmt.o fpu32.o ptrace32.o

	ia32_binfmt.o fpu32.o



sysv-$(CONFIG_SYSVIPC) := ipc32.o

obj-$(CONFIG_IA32_EMULATION) += $(sysv-y)

arch/x86/kernel/Makefile_64

+2 −1
Original line number Diff line number Diff line
@@ -7,12 +7,13 @@ CPPFLAGS_vmlinux.lds += -Ux86_64 
EXTRA_AFLAGS	:= -traditional



obj-y	:= process_64.o signal_64.o entry_64.o traps_64.o irq_64.o \

		ptrace_64.o time_64.o ioport_64.o ldt.o setup_64.o i8259_64.o sys_x86_64.o \

		time_64.o ioport_64.o ldt.o setup_64.o i8259_64.o sys_x86_64.o \

		x8664_ksyms_64.o i387_64.o syscall_64.o vsyscall_64.o \

		setup64.o bootflag.o e820_64.o reboot_64.o quirks.o i8237.o \

		pci-dma_64.o pci-nommu_64.o alternative.o hpet.o tsc_64.o bugs_64.o \

		i8253.o io_delay.o rtc.o



obj-y				+= ptrace.o

obj-y				+= step.o



obj-$(CONFIG_IA32_EMULATION)	+= tls.o

include/asm-x86/ptrace.h

+0 −3
Original line number Diff line number Diff line
@@ -164,9 +164,6 @@ void signal_fault(struct pt_regs *regs, void __user *frame, char *where); 


struct task_struct;



extern unsigned long ptrace_get_debugreg(struct task_struct *child, int n);

extern int ptrace_set_debugreg(struct task_struct *child, int n, unsigned long);



extern unsigned long

convert_rip_to_linear(struct task_struct *child, struct pt_regs *regs);