diff options
author | Roland McGrath <roland@redhat.com> | 2008-01-30 07:30:45 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:30:45 -0500 |
commit | 13abd0e50433092c41551bc13c32268028b6d663 (patch) | |
tree | 25637d680966f6f021cf469614e5838963ead20c /arch/x86/kernel/Makefile_64 | |
parent | 12c3cbbb7e3218b1c3ed4c97b3496fc3f94ea967 (diff) |
x86: tls32 moved
This renames arch/x86/ia32/tls32.c to arch/x86/kernel/tls.c, which does
nothing now but paves the way to consolidate this code for 32-bit too.
Signed-off-by: Roland McGrath <roland@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Zachary Amsden <zach@vmware.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/Makefile_64')
-rw-r--r-- | arch/x86/kernel/Makefile_64 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/Makefile_64 b/arch/x86/kernel/Makefile_64 index ae95d21ea885..e1ba82e582a8 100644 --- a/arch/x86/kernel/Makefile_64 +++ b/arch/x86/kernel/Makefile_64 | |||
@@ -13,6 +13,7 @@ obj-y := process_64.o signal_64.o entry_64.o traps_64.o irq_64.o \ | |||
13 | pci-dma_64.o pci-nommu_64.o alternative.o hpet.o tsc_64.o bugs_64.o \ | 13 | pci-dma_64.o pci-nommu_64.o alternative.o hpet.o tsc_64.o bugs_64.o \ |
14 | i8253.o io_delay.o rtc.o | 14 | i8253.o io_delay.o rtc.o |
15 | 15 | ||
16 | obj-$(CONFIG_IA32_EMULATION) += tls.o | ||
16 | obj-$(CONFIG_STACKTRACE) += stacktrace.o | 17 | obj-$(CONFIG_STACKTRACE) += stacktrace.o |
17 | obj-y += cpu/ | 18 | obj-y += cpu/ |
18 | obj-y += acpi/ | 19 | obj-y += acpi/ |