Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / include / linux / vserver / signal.h

diff --git a/include/linux/vserver/signal.h b/include/linux/vserver/signal.h
index 7d0d430..690168e 100644 (file)
--- a/include/linux/vserver/signal.h
+++ b/include/linux/vserver/signal.h
@@ -1,27 +1,14 @@
 #ifndef _VX_SIGNAL_H
 #define _VX_SIGNAL_H
 
-#include "switch.h"
-
-/*  context signalling */
-
-#define VCMD_ctx_kill          VC_CMD(PROCTRL, 1, 0)
-#define VCMD_wait_exit         VC_CMD(EVENT, 99, 0)
-
-struct vcmd_ctx_kill_v0 {
-       int32_t pid;
-       int32_t sig;
-};
-
-struct vcmd_wait_exit_v0 {
-       int32_t a;
-       int32_t b;
-};
 
 #ifdef __KERNEL__
 
-extern int vc_ctx_kill(uint32_t, void __user *);
-extern int vc_wait_exit(uint32_t, void __user *);
+struct vx_info;
+
+int vx_info_kill(struct vx_info *, int, int);
 
 #endif /* __KERNEL__ */
+#else  /* _VX_SIGNAL_H */
+#warning duplicate inclusion
 #endif /* _VX_SIGNAL_H */