Skip to contentSkip to conversation

x86: merge crash_dump_32.c and crash_dump_64.c

PATCH New Amerigo Wang 1 participant 1 message Dec 14, 2010 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86: merge crash_dump_32.c and crash_dump_64.c

This patch merges crash_dump_32.c and crash_dump_64.c into crash_dump.c. Compile tested.

---
 arch/x86/kernel/Makefile        |    2 +-
 arch/x86/kernel/crash_dump.c    |  142 +++++++++++++++++++++++++++++++++++++++
 arch/x86/kernel/crash_dump_32.c |   98 ---------------------------
 arch/x86/kernel/crash_dump_64.c |   52 --------------
 4 files changed, 143 insertions(+), 151 deletions(-)
 create mode 100644 arch/x86/kernel/crash_dump.c
 delete mode 100644 arch/x86/kernel/crash_dump_32.c
 delete mode 100644 arch/x86/kernel/crash_dump_64.c
arch/x86/kernel/Makefile +1 -1
index 9e13763..2cd2d6f 100644
@@ -77,7 +77,7 @@ obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o
 obj-$(CONFIG_FTRACE_SYSCALLS)	+= ftrace.o
 obj-$(CONFIG_KEXEC)		+= machine_kexec_$(BITS).o
 obj-$(CONFIG_KEXEC)		+= relocate_kernel_$(BITS).o crash.o
-obj-$(CONFIG_CRASH_DUMP)	+= crash_dump_$(BITS).o
+obj-$(CONFIG_CRASH_DUMP)	+= crash_dump.o
 obj-$(CONFIG_KPROBES)		+= kprobes.o
 obj-$(CONFIG_MODULES)		+= module.o
 obj-$(CONFIG_DOUBLEFAULT) 	+= doublefault_32.o
arch/x86/kernel/crash_dump.c new file +142 -0

142 lines not on this page · raw message

arch/x86/kernel/crash_dump_32.c deleted +0 -98

98 lines not on this page · raw message

arch/x86/kernel/crash_dump_64.c deleted +0 -52

52 lines not on this page · raw message

Signature · 1 line
1.7.3.3