diff options
author | Roland McGrath <roland@redhat.com> | 2008-01-30 07:31:01 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:31:01 -0500 |
commit | d52e9d690fff1fd9d0ccffe375fd01b700f82a64 (patch) | |
tree | 5738041b8623af86b35d033ffc6285b202d28c4f /arch/x86/kernel | |
parent | 0f5340933f9bacb403f49baaf8073320e3984841 (diff) |
x86: ptrace_32 renamed
This renames ptrace_32.c back to ptrace.c, in preparation
for merging the 32/64 versions of these files.
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/x86/kernel')
-rw-r--r-- | arch/x86/kernel/Makefile_32 | 3 | ||||
-rw-r--r-- | arch/x86/kernel/ptrace.c (renamed from arch/x86/kernel/ptrace_32.c) | 0 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/Makefile_32 b/arch/x86/kernel/Makefile_32 index 20e23c4c18b6..b2d7aea4c82d 100644 --- a/arch/x86/kernel/Makefile_32 +++ b/arch/x86/kernel/Makefile_32 | |||
@@ -6,10 +6,11 @@ extra-y := head_32.o init_task.o vmlinux.lds | |||
6 | CPPFLAGS_vmlinux.lds += -Ui386 | 6 | CPPFLAGS_vmlinux.lds += -Ui386 |
7 | 7 | ||
8 | obj-y := process_32.o signal_32.o entry_32.o traps_32.o irq_32.o \ | 8 | obj-y := process_32.o signal_32.o entry_32.o traps_32.o irq_32.o \ |
9 | ptrace_32.o time_32.o ioport_32.o ldt.o setup_32.o i8259_32.o sys_i386_32.o \ | 9 | time_32.o ioport_32.o ldt.o setup_32.o i8259_32.o sys_i386_32.o \ |
10 | pci-dma_32.o i386_ksyms_32.o i387_32.o bootflag.o e820_32.o\ | 10 | pci-dma_32.o i386_ksyms_32.o i387_32.o bootflag.o e820_32.o\ |
11 | quirks.o i8237.o topology.o alternative.o i8253.o tsc_32.o io_delay.o rtc.o | 11 | quirks.o i8237.o topology.o alternative.o i8253.o tsc_32.o io_delay.o rtc.o |
12 | 12 | ||
13 | obj-y += ptrace.o | ||
13 | obj-y += tls.o | 14 | obj-y += tls.o |
14 | obj-y += step.o | 15 | obj-y += step.o |
15 | obj-$(CONFIG_STACKTRACE) += stacktrace.o | 16 | obj-$(CONFIG_STACKTRACE) += stacktrace.o |
diff --git a/arch/x86/kernel/ptrace_32.c b/arch/x86/kernel/ptrace.c index fed83d066135..fed83d066135 100644 --- a/arch/x86/kernel/ptrace_32.c +++ b/arch/x86/kernel/ptrace.c | |||