summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-17 13:24:52 +0100
committerIngo Molnar <mingo@elte.hu>2008-12-17 13:24:52 +0100
commit855caa37b9b61c1ccfeb91a2bc04d90bfc5e4525 (patch)
treef95e80165c293f43321b17c4280acfca478d9ba8 /include
parent948a7b2b5e2bf126fb697aeb11ff379b2c85dd2e (diff)
parentc415b3dce30dfb41234e118662e8720f47343a4f (diff)
downloadop-kernel-dev-855caa37b9b61c1ccfeb91a2bc04d90bfc5e4525.zip
op-kernel-dev-855caa37b9b61c1ccfeb91a2bc04d90bfc5e4525.tar.gz
Merge branch 'x86/crashdump' into cpus4096
Conflicts: arch/x86/kernel/crash.c Merged for semantic conflict: arch/x86/kernel/reboot.c
Diffstat (limited to 'include')
-rw-r--r--include/linux/kexec.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/kexec.h b/include/linux/kexec.h
index 17f76fc..adc34f2 100644
--- a/include/linux/kexec.h
+++ b/include/linux/kexec.h
@@ -100,6 +100,10 @@ struct kimage {
#define KEXEC_TYPE_DEFAULT 0
#define KEXEC_TYPE_CRASH 1
unsigned int preserve_context : 1;
+
+#ifdef ARCH_HAS_KIMAGE_ARCH
+ struct kimage_arch arch;
+#endif
};
OpenPOWER on IntegriCloud