From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Thu, 1 Dec 2005 20:05:49 +0000 (+0000)
Subject: - merge revision 1.3
X-Git-Tag: planetlab-3_2-rc6~4
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=6937e87bdccf1e7d0db3d5d6ccc705d116c83f6a;p=linux-2.6.git

- merge revision 1.3
date: 2005/11/21 23:06:00;  author: mlhuang;  state: Exp;  lines: +1 -1
- enable kexec syscall
---

diff --git a/arch/i386/kernel/syscall_table.S b/arch/i386/kernel/syscall_table.S
index 994a199dd..cd4cbd612 100644
--- a/arch/i386/kernel/syscall_table.S
+++ b/arch/i386/kernel/syscall_table.S
@@ -291,7 +291,7 @@ ENTRY(sys_call_table)
 	.long sys_mq_timedreceive	/* 280 */
 	.long sys_mq_notify
 	.long sys_mq_getsetattr
-	.long sys_ni_syscall		/* reserved for kexec */
+	.long sys_kexec_load
 	.long sys_waitid
 	.long sys_ni_syscall		/* 285 */ /* available */
 	.long sys_add_key