mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-11 00:42:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'x86/crashdump' into cpus4096

Browse Source 
Conflicts:
	arch/x86/kernel/crash.c

Merged for semantic conflict:
	arch/x86/kernel/reboot.c
This commit is contained in:
Ingo Molnar
2008-12-17 13:24:52 +01:00
parent 948a7b2b5e c415b3dce3
commit 855caa37b9
7 changed files with 211 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/kexec.h
View File

@@ -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
};