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

- merge revision 1.2
date: 2005/11/22 16:04:20;  author: mlhuang;  state: Exp;  lines: +2 -0
- disable kexec syscall for uml
---

diff --git a/arch/um/sys-i386/sys_call_table.S b/arch/um/sys-i386/sys_call_table.S
index ad75c27af..e4b44f289 100644
--- a/arch/um/sys-i386/sys_call_table.S
+++ b/arch/um/sys-i386/sys_call_table.S
@@ -13,4 +13,6 @@
 #define sys_time um_time
 #define old_mmap old_mmap_i386
 
+#define sys_kexec_load sys_ni_syscall
+	
 #include "../../i386/kernel/syscall_table.S"