aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/kexec.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-02-09 11:19:21 -0500
committerTakashi Iwai <tiwai@suse.de>2009-02-09 11:19:21 -0500
commit2a074f4a54d11ec0ce16b35e9a88feaa2fd886aa (patch)
treeb81ab05dac66fa0cccf44896d2d86be7ba52aa49 /kernel/kexec.c
parent23c7b521c250b261dd97a7a06d5a2e74b56233d5 (diff)
parent8bd4bb7a35e8ebb015a531218614c48e10a3c4ee (diff)
Merge branch 'topic/quirk-cleanup' into topic/hda
Diffstat (limited to 'kernel/kexec.c')
-rw-r--r--kernel/kexec.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/kexec.c b/kernel/kexec.c
index 3fb855ad6aa0..8a6d7b08864e 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -934,9 +934,8 @@ struct kimage *kexec_crash_image;
934 934
935static DEFINE_MUTEX(kexec_mutex); 935static DEFINE_MUTEX(kexec_mutex);
936 936
937asmlinkage long sys_kexec_load(unsigned long entry, unsigned long nr_segments, 937SYSCALL_DEFINE4(kexec_load, unsigned long, entry, unsigned long, nr_segments,
938 struct kexec_segment __user *segments, 938 struct kexec_segment __user *, segments, unsigned long, flags)
939 unsigned long flags)
940{ 939{
941 struct kimage **dest_image, *image; 940 struct kimage **dest_image, *image;
942 int result; 941 int result;