Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / kernel / sys_ni.c

diff --git a/kernel/sys_ni.c b/kernel/sys_ni.c
index 6f15bea7d1a83dc363826c5bcdb2c0013feaebc0..29196ce9b40f09a9398d78e1c4ee555dd93f6c04 100644 (file)
--- a/kernel/sys_ni.c
+++ b/kernel/sys_ni.c
@@ -18,6 +18,8 @@ cond_syscall(sys_acct);
 cond_syscall(sys_lookup_dcookie);
 cond_syscall(sys_swapon);
 cond_syscall(sys_swapoff);
+cond_syscall(sys_kexec_load);
+cond_syscall(compat_sys_kexec_load);
 cond_syscall(sys_init_module);
 cond_syscall(sys_delete_module);
 cond_syscall(sys_socketpair);