From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Mon, 8 Aug 2005 21:19:50 +0000 (+0000)
Subject: This commit was generated by cvs2svn to compensate for changes in r721,
X-Git-Tag: before-fedora-2_6_18-1_2239_FC5-vs2_0_2_2-rc6-merge~184
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=f5223a4ce011c9dcbc6a0b413b4503e98470e753;p=linux-2.6.git

This commit was generated by cvs2svn to compensate for changes in r721,
which included commits to RCS files with non-trunk default branches.
---

diff --git a/kernel/vserver/vci_config.h b/kernel/vserver/vci_config.h
index 8d55a4960..8c9838ce6 100644
--- a/kernel/vserver/vci_config.h
+++ b/kernel/vserver/vci_config.h
@@ -8,6 +8,8 @@ enum {
 	VCI_KCBIT_HARDCPU,
 	VCI_KCBIT_HARDCPU_IDLE,
 
+	VCI_KCBIT_LEGACY_VERSION,
+
 	VCI_KCBIT_DEBUG = 16,
 	VCI_KCBIT_HISTORY = 20,
 	VCI_KCBIT_TAGXID = 24,
@@ -24,6 +26,9 @@ static inline uint32_t vci_kernel_config(void)
 #ifdef	CONFIG_VSERVER_LEGACYNET
 	(1 << VCI_KCBIT_LEGACYNET) |
 #endif
+#ifdef	CONFIG_VSERVER_LEGACY_VERSION
+	(1 << VCI_KCBIT_LEGACY_VERSION) |
+#endif
 
 	/* configured features */
 #ifdef	CONFIG_VSERVER_PROC_SECURE