From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Thu, 27 Jul 2006 21:05:51 +0000 (+0000)
Subject: This commit was generated by cvs2svn to compensate for changes in r925,
X-Git-Tag: before-fedora-2_6_18-1_2239_FC5-vs2_0_2_2-rc6-merge~35
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=f460e762297481e1d0ee30a4f5f368d259193e64;p=linux-2.6.git

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 ae7f9e4ef..4eb6d0d94 100644
--- 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 e842538a1..1a2bcc378 100644
--- 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 8c9838ce6..df9090c3c 100644
--- 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,