git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
[safe/jmp/linux-2.6]
/
include
/
linux
/
kexec.h
diff --git
a/include/linux/kexec.h
b/include/linux/kexec.h
index
17f76fc
..
adc34f2
100644
(file)
--- 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
};