diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-07-27 19:26:31 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-07-27 19:26:30 -0700 |
| commit | 43dfbdc98af99ee849d9c949e7cfdde7de5b3ab3 (patch) | |
| tree | 175449677ffaad7ed70c0ae72c33f25c5a9d0221 /arch | |
| parent | 08cbc2ba00a15635bb31ba827f48e11dd37e35dd (diff) | |
| parent | 9b9d994aa44815fb126aa5955a4c2e6268925f9a (diff) | |
Merge "defconfig: um: Disable activity stats"
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/um/configs/x86_64_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/configs/x86_64_defconfig b/arch/um/configs/x86_64_defconfig index 3aab117bd553..f9ecc8270f54 100644 --- a/arch/um/configs/x86_64_defconfig +++ b/arch/um/configs/x86_64_defconfig @@ -15,7 +15,6 @@ CONFIG_CGROUP_FREEZER=y CONFIG_CGROUP_DEVICE=y CONFIG_CPUSETS=y CONFIG_CGROUP_CPUACCT=y -CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_SCHED=y CONFIG_BLK_CGROUP=y # CONFIG_PID_NS is not set @@ -54,6 +53,7 @@ CONFIG_UNIX=y CONFIG_INET=y # CONFIG_INET_LRO is not set # CONFIG_IPV6 is not set +# CONFIG_NET_ACTIVITY_STATS is not set CONFIG_UML_NET=y CONFIG_UML_NET_ETHERTAP=y CONFIG_UML_NET_TUNTAP=y |