diff options
| author |   Roland McGrath <roland@redhat.com> | 2008-01-30 13:31:02 +0100 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:31:02 +0100 |
| commit | cbc9d9d98215f08ed998228e7bce88502d1ce360 (patch) | |
| tree | f1a054c06fc294c6b56a7631f0269025ced26c30 /arch | |
| parent | x86: x86 ia32 ptrace arch merge (diff) | |
| download | linux-dev-cbc9d9d98215f08ed998228e7bce88502d1ce360.tar.xz linux-dev-cbc9d9d98215f08ed998228e7bce88502d1ce360.zip | |
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: Roland McGrath <roland@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/ia32/Makefile | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/Makefile_64 | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/ia32/Makefile b/arch/x86/ia32/Makefile index ea6088640847..ec71cfeac87e 100644 --- a/arch/x86/ia32/Makefile +++ b/arch/x86/ia32/Makefile @@ -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) diff --git a/arch/x86/kernel/Makefile_64 b/arch/x86/kernel/Makefile_64 index d908f0175e76..b41e838dc788 100644 --- a/arch/x86/kernel/Makefile_64 +++ b/arch/x86/kernel/Makefile_64 @@ -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 |