This commit was generated by cvs2svn to compensate for changes in r925,

which included commits to RCS files with non-trunk default branches.

diff --git a/include/linux/vroot.h b/include/linux/vroot.h
index ae7f9e4..4eb6d0d 100644 (file)
--- a/include/linux/vroot.h
+++ b/include/linux/vroot.h
@@ -31,6 +31,12 @@ struct vroot_device {
        int                     vr_state;
 };
 
+
+typedef struct block_device *(vroot_grb_func)(struct block_device *);
+
+extern int register_vroot_grb(vroot_grb_func *);
+extern int unregister_vroot_grb(vroot_grb_func *);
+
 #endif /* __KERNEL__ */
 
 #define MAX_VROOT_DEFAULT      8

diff --git a/include/linux/vserver/signal_cmd.h b/include/linux/vserver/signal_cmd.h
index e842538..1a2bcc3 100644 (file)
--- a/include/linux/vserver/signal_cmd.h
+++ b/include/linux/vserver/signal_cmd.h
@@ -1,6 +1,7 @@
 #ifndef _VX_SIGNAL_CMD_H
 #define _VX_SIGNAL_CMD_H
 
+
 /*  signalling vserver commands */
 
 #define VCMD_ctx_kill          VC_CMD(PROCTRL, 1, 0)
@@ -12,8 +13,8 @@ struct        vcmd_ctx_kill_v0 {
 };
 
 struct vcmd_wait_exit_v0 {
-       int32_t a;
-       int32_t b;
+       int32_t reboot_cmd;
+       int32_t exit_code;
 };
 
 #ifdef __KERNEL__

diff --git a/kernel/vserver/vci_config.h b/kernel/vserver/vci_config.h
index 8c9838c..df9090c 100644 (file)
--- a/kernel/vserver/vci_config.h
+++ b/kernel/vserver/vci_config.h
@@ -8,7 +8,7 @@ enum {
        VCI_KCBIT_HARDCPU,
        VCI_KCBIT_HARDCPU_IDLE,
 
-       VCI_KCBIT_LEGACY_VERSION,
+       VCI_KCBIT_LEGACY_VERSION = 15,
 
        VCI_KCBIT_DEBUG = 16,
        VCI_KCBIT_HISTORY = 20,