aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/kexec.h13
-rw-r--r--include/linux/syscalls.h6
2 files changed, 11 insertions, 8 deletions
diff --git a/include/linux/kexec.h b/include/linux/kexec.h
index 7383173a3a9c..c8468472aec0 100644
--- a/include/linux/kexec.h
+++ b/include/linux/kexec.h
@@ -91,14 +91,17 @@ extern NORET_TYPE void machine_kexec(struct kimage *image) ATTRIB_NORET;
91extern int machine_kexec_prepare(struct kimage *image); 91extern int machine_kexec_prepare(struct kimage *image);
92extern void machine_kexec_cleanup(struct kimage *image); 92extern void machine_kexec_cleanup(struct kimage *image);
93extern asmlinkage long sys_kexec_load(unsigned long entry, 93extern asmlinkage long sys_kexec_load(unsigned long entry,
94 unsigned long nr_segments, struct kexec_segment __user *segments, 94 unsigned long nr_segments,
95 unsigned long flags); 95 struct kexec_segment __user *segments,
96 unsigned long flags);
96#ifdef CONFIG_COMPAT 97#ifdef CONFIG_COMPAT
97extern asmlinkage long compat_sys_kexec_load(unsigned long entry, 98extern asmlinkage long compat_sys_kexec_load(unsigned long entry,
98 unsigned long nr_segments, struct compat_kexec_segment __user *segments, 99 unsigned long nr_segments,
99 unsigned long flags); 100 struct compat_kexec_segment __user *segments,
101 unsigned long flags);
100#endif 102#endif
101extern struct page *kimage_alloc_control_pages(struct kimage *image, unsigned int order); 103extern struct page *kimage_alloc_control_pages(struct kimage *image,
104 unsigned int order);
102extern void crash_kexec(struct pt_regs *); 105extern void crash_kexec(struct pt_regs *);
103int kexec_should_crash(struct task_struct *); 106int kexec_should_crash(struct task_struct *);
104extern struct kimage *kexec_image; 107extern struct kimage *kexec_image;
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 7ba8f8f747aa..52830b6d94e5 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -159,9 +159,9 @@ asmlinkage long sys_shutdown(int, int);
159asmlinkage long sys_reboot(int magic1, int magic2, unsigned int cmd, 159asmlinkage long sys_reboot(int magic1, int magic2, unsigned int cmd,
160 void __user *arg); 160 void __user *arg);
161asmlinkage long sys_restart_syscall(void); 161asmlinkage long sys_restart_syscall(void);
162asmlinkage long sys_kexec_load(unsigned long entry, 162asmlinkage long sys_kexec_load(unsigned long entry, unsigned long nr_segments,
163 unsigned long nr_segments, struct kexec_segment __user *segments, 163 struct kexec_segment __user *segments,
164 unsigned long flags); 164 unsigned long flags);
165 165
166asmlinkage long sys_exit(int error_code); 166asmlinkage long sys_exit(int error_code);
167asmlinkage void sys_exit_group(int error_code); 167asmlinkage void sys_exit_group(int error_code);