diff options
| author | William Pitcock <nenolod@dereferenced.org> | 2011-12-02 22:51:02 -0600 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2011-12-02 22:51:02 -0600 |
| commit | 7329021845d3341154b1340a3caffc01c48f9a51 (patch) | |
| tree | f1476a41afd876804f6fe0214ea0668d2bb98247 /main/linux-vserver/kernelconfig.x86 | |
| parent | 178025eb61e2713479eb07a201b1d3cff34a9bd5 (diff) | |
| download | aports-7329021845d3341154b1340a3caffc01c48f9a51.tar.bz2 aports-7329021845d3341154b1340a3caffc01c48f9a51.tar.xz | |
main/linux-vserver: harden vcontext access, add support for memory controller cgroup (needed by newest util-vserver), add netlink task stats accounting
Diffstat (limited to 'main/linux-vserver/kernelconfig.x86')
| -rw-r--r-- | main/linux-vserver/kernelconfig.x86 | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/main/linux-vserver/kernelconfig.x86 b/main/linux-vserver/kernelconfig.x86 index eb1d4bc289..849e86c412 100644 --- a/main/linux-vserver/kernelconfig.x86 +++ b/main/linux-vserver/kernelconfig.x86 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 3.0.9-vs2.3.2.1 Kernel Configuration +# Linux/i386 3.0.10-vs2.3.2.1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -81,7 +81,10 @@ CONFIG_SYSVIPC_SYSCTL=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y # CONFIG_FHANDLE is not set -# CONFIG_TASKSTATS is not set +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y # CONFIG_AUDIT is not set CONFIG_HAVE_GENERIC_HARDIRQS=y @@ -116,7 +119,9 @@ CONFIG_CGROUP_FREEZER=y CONFIG_CGROUP_DEVICE=y # CONFIG_CPUSETS is not set CONFIG_CGROUP_CPUACCT=y -# CONFIG_RESOURCE_COUNTERS is not set +CONFIG_RESOURCE_COUNTERS=y +CONFIG_CGROUP_MEM_RES_CTLR=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y @@ -129,6 +134,7 @@ CONFIG_IPC_NS=y CONFIG_PID_NS=y CONFIG_NET_NS=y CONFIG_SCHED_AUTOGROUP=y +CONFIG_MM_OWNER=y # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_RELAY is not set CONFIG_BLK_DEV_INITRD=y @@ -4915,7 +4921,7 @@ CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4 CONFIG_ENABLE_WARN_DEPRECATED=y # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_FRAME_WARN=1024 -# CONFIG_MAGIC_SYSRQ is not set +CONFIG_MAGIC_SYSRQ=y # CONFIG_STRIP_ASM_SYMS is not set # CONFIG_UNUSED_SYMBOLS is not set CONFIG_DEBUG_FS=y @@ -4988,7 +4994,7 @@ CONFIG_VSERVER_PROC_SECURE=y CONFIG_TAGGING_ID24=y # CONFIG_TAGGING_INTERN is not set # CONFIG_TAG_NFSD is not set -# CONFIG_VSERVER_PRIVACY is not set +CONFIG_VSERVER_PRIVACY=y CONFIG_VSERVER_CONTEXTS=256 CONFIG_VSERVER_WARN=y CONFIG_VSERVER_WARN_DEVPTS=y |