diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/kexec.h | 8 | ||||
-rw-r--r-- | include/linux/reboot.h | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/include/linux/kexec.h b/include/linux/kexec.h index 0653a27c3d72..7383173a3a9c 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h | |||
@@ -99,7 +99,8 @@ extern asmlinkage long compat_sys_kexec_load(unsigned long entry, | |||
99 | unsigned long flags); | 99 | unsigned long flags); |
100 | #endif | 100 | #endif |
101 | extern struct page *kimage_alloc_control_pages(struct kimage *image, unsigned int order); | 101 | extern struct page *kimage_alloc_control_pages(struct kimage *image, unsigned int order); |
102 | extern void crash_kexec(void); | 102 | extern void crash_kexec(struct pt_regs *); |
103 | int kexec_should_crash(struct task_struct *); | ||
103 | extern struct kimage *kexec_image; | 104 | extern struct kimage *kexec_image; |
104 | 105 | ||
105 | #define KEXEC_ON_CRASH 0x00000001 | 106 | #define KEXEC_ON_CRASH 0x00000001 |
@@ -123,6 +124,9 @@ extern struct kimage *kexec_image; | |||
123 | extern struct resource crashk_res; | 124 | extern struct resource crashk_res; |
124 | 125 | ||
125 | #else /* !CONFIG_KEXEC */ | 126 | #else /* !CONFIG_KEXEC */ |
126 | static inline void crash_kexec(void) { } | 127 | struct pt_regs; |
128 | struct task_struct; | ||
129 | static inline void crash_kexec(struct pt_regs *regs) { } | ||
130 | static inline int kexec_should_crash(struct task_struct *p) { return 0; } | ||
127 | #endif /* CONFIG_KEXEC */ | 131 | #endif /* CONFIG_KEXEC */ |
128 | #endif /* LINUX_KEXEC_H */ | 132 | #endif /* LINUX_KEXEC_H */ |
diff --git a/include/linux/reboot.h b/include/linux/reboot.h index c5a05e16edb2..2d4dd23168dd 100644 --- a/include/linux/reboot.h +++ b/include/linux/reboot.h | |||
@@ -52,7 +52,8 @@ extern void machine_halt(void); | |||
52 | extern void machine_power_off(void); | 52 | extern void machine_power_off(void); |
53 | 53 | ||
54 | extern void machine_shutdown(void); | 54 | extern void machine_shutdown(void); |
55 | extern void machine_crash_shutdown(void); | 55 | struct pt_regs; |
56 | extern void machine_crash_shutdown(struct pt_regs *); | ||
56 | 57 | ||
57 | #endif | 58 | #endif |
58 | 59 | ||