git://git.onelab.eu
/
linux-2.6.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
abff417
)
This commit was generated by cvs2svn to compensate for changes in r721,
author
Marc Fiuczynski
<mef@cs.princeton.edu>
Mon, 8 Aug 2005 21:19:50 +0000
(21:19 +0000)
committer
Marc Fiuczynski
<mef@cs.princeton.edu>
Mon, 8 Aug 2005 21:19:50 +0000
(21:19 +0000)
which included commits to RCS files with non-trunk default branches.
kernel/vserver/vci_config.h
patch
|
blob
|
history
diff --git
a/kernel/vserver/vci_config.h
b/kernel/vserver/vci_config.h
index
8d55a49
..
8c9838c
100644
(file)
--- 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