diff options
| author | rhatto <rhatto@370017ae-e619-0410-ac65-c121f96126d4> | 2008-09-03 03:50:43 +0000 |
|---|---|---|
| committer | rhatto <rhatto@370017ae-e619-0410-ac65-c121f96126d4> | 2008-09-03 03:50:43 +0000 |
| commit | dda36349496e0987f0ccf4f23929f7870ba11813 (patch) | |
| tree | 1b469ee961c93e7f3565a52a6c50a0caba9afa9c /sys/kernel | |
| parent | b1c576dfbc932afc7c1ecc09348df2dcc5ac3fc7 (diff) | |
| download | slackbuilds-dda36349496e0987f0ccf4f23929f7870ba11813.tar.gz slackbuilds-dda36349496e0987f0ccf4f23929f7870ba11813.tar.bz2 | |
merging with changes made since 21th May
git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@1903 370017ae-e619-0410-ac65-c121f96126d4
Diffstat (limited to 'sys/kernel')
| -rw-r--r-- | sys/kernel/kernel-satan/config-2.6.22.19-vs2.2.0.6 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/kernel/kernel-satan/config-2.6.22.19-vs2.2.0.6 b/sys/kernel/kernel-satan/config-2.6.22.19-vs2.2.0.6 index a8d7bd5c..d31f3216 100644 --- a/sys/kernel/kernel-satan/config-2.6.22.19-vs2.2.0.6 +++ b/sys/kernel/kernel-satan/config-2.6.22.19-vs2.2.0.6 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.22.19-vs2.2.0.6 -# Thu Mar 13 00:38:37 2008 +# Mon Jun 9 22:52:06 2008 # CONFIG_X86_64=y CONFIG_64BIT=y @@ -1508,7 +1508,9 @@ CONFIG_VSERVER_LEGACYNET=y # CONFIG_VSERVER_COWBL is not set CONFIG_VSERVER_VTIME=y CONFIG_VSERVER_PROC_SECURE=y -# CONFIG_VSERVER_HARDCPU is not set +CONFIG_VSERVER_HARDCPU=y +CONFIG_VSERVER_IDLETIME=y +# CONFIG_VSERVER_IDLELIMIT is not set # CONFIG_TAGGING_NONE is not set # CONFIG_TAGGING_UID16 is not set # CONFIG_TAGGING_GID16 is not set |