aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/kexec.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2006-12-07 18:39:22 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-07 18:39:22 -0500
commit6ee7e78e7c78d871409ad4df30551c9355be7d0e (patch)
tree84deeea72d7234d0b5652483b11760f394ae1131 /include/linux/kexec.h
parent7f3af60e5a444b287d740a84998a8f480645dadf (diff)
parent52fd91088bcbaea5ab441d09d39c21eb684e54ea (diff)
Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] replace kmalloc+memset with kzalloc [IA64] resolve name clash by renaming is_available_memory() [IA64] Need export for csum_ipv6_magic [IA64] Fix DISCONTIGMEM without VIRTUAL_MEM_MAP [PATCH] Add support for type argument in PAL_GET_PSTATE [IA64] tidy up return value of ip_fast_csum [IA64] implement csum_ipv6_magic for ia64. [IA64] More Itanium PAL spec updates [IA64] Update processor_info features [IA64] Add se bit to Processor State Parameter structure [IA64] Add dp bit to cache and bus check structs [IA64] SN: Correctly update smp_affinty mask [IA64] sparse cleanups [IA64] IA64 Kexec/kdump
Diffstat (limited to 'include/linux/kexec.h')
-rw-r--r--include/linux/kexec.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/kexec.h b/include/linux/kexec.h
index e3abcec6c51c..d02425cdd801 100644
--- a/include/linux/kexec.h
+++ b/include/linux/kexec.h
@@ -109,6 +109,10 @@ void crash_save_cpu(struct pt_regs *regs, int cpu);
109extern struct kimage *kexec_image; 109extern struct kimage *kexec_image;
110extern struct kimage *kexec_crash_image; 110extern struct kimage *kexec_crash_image;
111 111
112#ifndef kexec_flush_icache_page
113#define kexec_flush_icache_page(page)
114#endif
115
112#define KEXEC_ON_CRASH 0x00000001 116#define KEXEC_ON_CRASH 0x00000001
113#define KEXEC_ARCH_MASK 0xffff0000 117#define KEXEC_ARCH_MASK 0xffff0000
114 118
@@ -134,6 +138,7 @@ extern struct resource crashk_res;
134typedef u32 note_buf_t[MAX_NOTE_BYTES/4]; 138typedef u32 note_buf_t[MAX_NOTE_BYTES/4];
135extern note_buf_t *crash_notes; 139extern note_buf_t *crash_notes;
136 140
141
137#else /* !CONFIG_KEXEC */ 142#else /* !CONFIG_KEXEC */
138struct pt_regs; 143struct pt_regs;
139struct task_struct; 144struct task_struct;