---

yaml --- r: 44411 b: refs/heads/master c: 53da576 h: refs/heads/master i: 44409: db6dccd 44407: e98a507 v: v3
git-mirror · Dec 12, 2006 · a427aa7 · a427aa7
1 parent 76c1b05
commit a427aa7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad1c3ba7e54fc38b119c1a7d5c98f9ffb8227fdb
+refs/heads/master: 53da5763bf129def6fe69ea5301d625ce9a86edf
diff --git a/trunk/arch/ia64/kernel/machine_kexec.c b/trunk/arch/ia64/kernel/machine_kexec.c
@@ -19,8 +19,11 @@
 #include <asm/delay.h>
 #include <asm/meminit.h>
 
-typedef void (*relocate_new_kernel_t)(unsigned long, unsigned long,
-		struct ia64_boot_param *, unsigned long);
+typedef NORET_TYPE void (*relocate_new_kernel_t)(
+					unsigned long indirection_page,
+					unsigned long start_address,
+					struct ia64_boot_param *boot_param,
+					unsigned long pal_addr) ATTRIB_NORET;
 
 struct kimage *ia64_kimage;