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 3911127..690168e 100644 (file)
--- a/include/linux/vserver/signal.h
+++ b/include/linux/vserver/signal.h
@@ -1,19 +1,14 @@
 #ifndef _VX_SIGNAL_H
 #define _VX_SIGNAL_H
 
-#include "switch.h"
 
-/*  context signalling */
-
-#define VCMD_ctx_kill          VC_CMD(PROCTRL, 1, 0)
+#ifdef __KERNEL__
 
-struct  vcmd_ctx_kill_v0 {
-       int32_t pid;
-       int32_t sig;
-};
+struct vx_info;
 
-#ifdef __KERNEL__
-extern int vc_ctx_kill(uint32_t, void __user *);
+int vx_info_kill(struct vx_info *, int, int);
 
 #endif /* __KERNEL__ */
+#else  /* _VX_SIGNAL_H */
+#warning duplicate inclusion
 #endif /* _VX_SIGNAL_H */