Move the stacktrace.c to the common area. Signed-off-by: Steven Rostedt diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile index 72e11f7..a5cf2e7 100644 --- a/arch/i386/kernel/Makefile +++ b/arch/i386/kernel/Makefile @@ -9,7 +9,6 @@ obj-y := process.o signal.o entry.o traps.o irq.o \ pci-dma.o i386_ksyms.o i387.o e820.o\ i8253.o tsc.o -obj-$(CONFIG_STACKTRACE) += stacktrace.o obj-y += cpu/ obj-y += acpi/ obj-$(CONFIG_X86_BIOS_REBOOT) += reboot.o @@ -77,5 +76,3 @@ $(obj)/vsyscall-syms.o: $(src)/vsyscall.lds \ $(obj)/vsyscall-sysenter.o $(obj)/vsyscall-note.o FORCE $(call if_changed,syscall) -stacktrace-y += ../../x86_64/kernel/stacktrace.o - diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 06c335d..297cde9 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -1,5 +1,7 @@ obj-y += bootflag.o quirks.o i8237.o topology.o alternative.o +obj-$(CONFIG_STACKTRACE) += stacktrace.o + obj-y += cpu/ obj-$(CONFIG_ACPI) += acpi/ diff --git a/arch/x86_64/kernel/stacktrace.c b/arch/x86/kernel/stacktrace.c similarity index 100% rename from arch/x86_64/kernel/stacktrace.c rename to arch/x86/kernel/stacktrace.c diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile index 0510887..7477cb1 100644 --- a/arch/x86_64/kernel/Makefile +++ b/arch/x86_64/kernel/Makefile @@ -10,7 +10,6 @@ obj-y := process.o signal.o entry.o traps.o irq.o \ setup64.o e820.o reboot.o \ pci-dma.o pci-nommu.o hpet.o tsc.o -obj-$(CONFIG_STACKTRACE) += stacktrace.o obj-$(CONFIG_X86_MCE) += mce.o obj-$(CONFIG_X86_MCE_INTEL) += mce_intel.o obj-$(CONFIG_X86_MCE_AMD) += mce_amd.o -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/