diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/configs/bcm_defconfig | 1 | ||||
-rw-r--r-- | arch/arm/configs/zx_defconfig | 1 | ||||
-rw-r--r-- | arch/mips/configs/db1xxx_defconfig | 1 | ||||
-rw-r--r-- | arch/mips/configs/loongson3_defconfig | 1 | ||||
-rw-r--r-- | arch/mn10300/configs/asb2364_defconfig | 1 | ||||
-rw-r--r-- | arch/sh/configs/apsh4ad0a_defconfig | 1 | ||||
-rw-r--r-- | arch/sh/configs/sdk7786_defconfig | 1 | ||||
-rw-r--r-- | arch/sh/configs/se7206_defconfig | 1 | ||||
-rw-r--r-- | arch/sh/configs/shx3_defconfig | 1 | ||||
-rw-r--r-- | arch/sh/configs/urquell_defconfig | 1 | ||||
-rw-r--r-- | arch/tile/configs/tilegx_defconfig | 1 | ||||
-rw-r--r-- | arch/tile/configs/tilepro_defconfig | 1 | ||||
-rw-r--r-- | arch/um/configs/i386_defconfig | 1 | ||||
-rw-r--r-- | arch/um/configs/x86_64_defconfig | 1 | ||||
-rw-r--r-- | arch/x86/configs/i386_defconfig | 1 | ||||
-rw-r--r-- | arch/x86/configs/x86_64_defconfig | 1 | ||||
-rw-r--r-- | arch/xtensa/configs/generic_kc705_defconfig | 1 | ||||
-rw-r--r-- | arch/xtensa/configs/smp_lx200_defconfig | 1 |
18 files changed, 0 insertions, 18 deletions
diff --git a/arch/arm/configs/bcm_defconfig b/arch/arm/configs/bcm_defconfig index 7117662bab2e..909049a280ec 100644 --- a/arch/arm/configs/bcm_defconfig +++ b/arch/arm/configs/bcm_defconfig | |||
@@ -12,7 +12,6 @@ CONFIG_CGROUPS=y | |||
12 | CONFIG_CGROUP_FREEZER=y | 12 | CONFIG_CGROUP_FREEZER=y |
13 | CONFIG_CGROUP_DEVICE=y | 13 | CONFIG_CGROUP_DEVICE=y |
14 | CONFIG_CGROUP_CPUACCT=y | 14 | CONFIG_CGROUP_CPUACCT=y |
15 | CONFIG_RESOURCE_COUNTERS=y | ||
16 | CONFIG_CGROUP_SCHED=y | 15 | CONFIG_CGROUP_SCHED=y |
17 | CONFIG_BLK_CGROUP=y | 16 | CONFIG_BLK_CGROUP=y |
18 | CONFIG_NAMESPACES=y | 17 | CONFIG_NAMESPACES=y |
diff --git a/arch/arm/configs/zx_defconfig b/arch/arm/configs/zx_defconfig index ab683fbbb954..d6253a48a9fa 100644 --- a/arch/arm/configs/zx_defconfig +++ b/arch/arm/configs/zx_defconfig | |||
@@ -7,7 +7,6 @@ CONFIG_CGROUPS=y | |||
7 | CONFIG_CGROUP_DEBUG=y | 7 | CONFIG_CGROUP_DEBUG=y |
8 | CONFIG_CGROUP_FREEZER=y | 8 | CONFIG_CGROUP_FREEZER=y |
9 | CONFIG_CGROUP_CPUACCT=y | 9 | CONFIG_CGROUP_CPUACCT=y |
10 | CONFIG_RESOURCE_COUNTERS=y | ||
11 | CONFIG_CGROUP_SCHED=y | 10 | CONFIG_CGROUP_SCHED=y |
12 | CONFIG_RT_GROUP_SCHED=y | 11 | CONFIG_RT_GROUP_SCHED=y |
13 | CONFIG_NAMESPACES=y | 12 | CONFIG_NAMESPACES=y |
diff --git a/arch/mips/configs/db1xxx_defconfig b/arch/mips/configs/db1xxx_defconfig index 3bdb72a70364..f0c8971030c4 100644 --- a/arch/mips/configs/db1xxx_defconfig +++ b/arch/mips/configs/db1xxx_defconfig | |||
@@ -18,7 +18,6 @@ CONFIG_CGROUP_FREEZER=y | |||
18 | CONFIG_CGROUP_DEVICE=y | 18 | CONFIG_CGROUP_DEVICE=y |
19 | CONFIG_CPUSETS=y | 19 | CONFIG_CPUSETS=y |
20 | CONFIG_CGROUP_CPUACCT=y | 20 | CONFIG_CGROUP_CPUACCT=y |
21 | CONFIG_RESOURCE_COUNTERS=y | ||
22 | CONFIG_MEMCG=y | 21 | CONFIG_MEMCG=y |
23 | CONFIG_MEMCG_SWAP=y | 22 | CONFIG_MEMCG_SWAP=y |
24 | CONFIG_MEMCG_KMEM=y | 23 | CONFIG_MEMCG_KMEM=y |
diff --git a/arch/mips/configs/loongson3_defconfig b/arch/mips/configs/loongson3_defconfig index f8bf915c6d6b..7f95c4b3ab2c 100644 --- a/arch/mips/configs/loongson3_defconfig +++ b/arch/mips/configs/loongson3_defconfig | |||
@@ -25,7 +25,6 @@ CONFIG_TASK_XACCT=y | |||
25 | CONFIG_TASK_IO_ACCOUNTING=y | 25 | CONFIG_TASK_IO_ACCOUNTING=y |
26 | CONFIG_LOG_BUF_SHIFT=14 | 26 | CONFIG_LOG_BUF_SHIFT=14 |
27 | CONFIG_CPUSETS=y | 27 | CONFIG_CPUSETS=y |
28 | CONFIG_RESOURCE_COUNTERS=y | ||
29 | CONFIG_MEMCG=y | 28 | CONFIG_MEMCG=y |
30 | CONFIG_MEMCG_SWAP=y | 29 | CONFIG_MEMCG_SWAP=y |
31 | CONFIG_BLK_CGROUP=y | 30 | CONFIG_BLK_CGROUP=y |
diff --git a/arch/mn10300/configs/asb2364_defconfig b/arch/mn10300/configs/asb2364_defconfig index fbb96ae3122a..cd0a6cb17dee 100644 --- a/arch/mn10300/configs/asb2364_defconfig +++ b/arch/mn10300/configs/asb2364_defconfig | |||
@@ -11,7 +11,6 @@ CONFIG_CGROUPS=y | |||
11 | CONFIG_CGROUP_FREEZER=y | 11 | CONFIG_CGROUP_FREEZER=y |
12 | CONFIG_CGROUP_DEVICE=y | 12 | CONFIG_CGROUP_DEVICE=y |
13 | CONFIG_CGROUP_CPUACCT=y | 13 | CONFIG_CGROUP_CPUACCT=y |
14 | CONFIG_RESOURCE_COUNTERS=y | ||
15 | CONFIG_RELAY=y | 14 | CONFIG_RELAY=y |
16 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 15 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
17 | CONFIG_EXPERT=y | 16 | CONFIG_EXPERT=y |
diff --git a/arch/sh/configs/apsh4ad0a_defconfig b/arch/sh/configs/apsh4ad0a_defconfig index a8d975793b6d..fe45d2c9b151 100644 --- a/arch/sh/configs/apsh4ad0a_defconfig +++ b/arch/sh/configs/apsh4ad0a_defconfig | |||
@@ -10,7 +10,6 @@ CONFIG_CGROUPS=y | |||
10 | CONFIG_CGROUP_FREEZER=y | 10 | CONFIG_CGROUP_FREEZER=y |
11 | CONFIG_CGROUP_DEVICE=y | 11 | CONFIG_CGROUP_DEVICE=y |
12 | CONFIG_CGROUP_CPUACCT=y | 12 | CONFIG_CGROUP_CPUACCT=y |
13 | CONFIG_RESOURCE_COUNTERS=y | ||
14 | CONFIG_CGROUP_MEMCG=y | 13 | CONFIG_CGROUP_MEMCG=y |
15 | CONFIG_BLK_CGROUP=y | 14 | CONFIG_BLK_CGROUP=y |
16 | CONFIG_NAMESPACES=y | 15 | CONFIG_NAMESPACES=y |
diff --git a/arch/sh/configs/sdk7786_defconfig b/arch/sh/configs/sdk7786_defconfig index e7e56a4131b4..36642ec2cb97 100644 --- a/arch/sh/configs/sdk7786_defconfig +++ b/arch/sh/configs/sdk7786_defconfig | |||
@@ -17,7 +17,6 @@ CONFIG_CGROUP_DEVICE=y | |||
17 | CONFIG_CPUSETS=y | 17 | CONFIG_CPUSETS=y |
18 | # CONFIG_PROC_PID_CPUSET is not set | 18 | # CONFIG_PROC_PID_CPUSET is not set |
19 | CONFIG_CGROUP_CPUACCT=y | 19 | CONFIG_CGROUP_CPUACCT=y |
20 | CONFIG_RESOURCE_COUNTERS=y | ||
21 | CONFIG_CGROUP_MEMCG=y | 20 | CONFIG_CGROUP_MEMCG=y |
22 | CONFIG_CGROUP_MEMCG_SWAP=y | 21 | CONFIG_CGROUP_MEMCG_SWAP=y |
23 | CONFIG_CGROUP_SCHED=y | 22 | CONFIG_CGROUP_SCHED=y |
diff --git a/arch/sh/configs/se7206_defconfig b/arch/sh/configs/se7206_defconfig index 6bc30ab9fd18..91853a67ec34 100644 --- a/arch/sh/configs/se7206_defconfig +++ b/arch/sh/configs/se7206_defconfig | |||
@@ -10,7 +10,6 @@ CONFIG_CGROUPS=y | |||
10 | CONFIG_CGROUP_DEBUG=y | 10 | CONFIG_CGROUP_DEBUG=y |
11 | CONFIG_CGROUP_DEVICE=y | 11 | CONFIG_CGROUP_DEVICE=y |
12 | CONFIG_CGROUP_CPUACCT=y | 12 | CONFIG_CGROUP_CPUACCT=y |
13 | CONFIG_RESOURCE_COUNTERS=y | ||
14 | CONFIG_CGROUP_MEMCG=y | 13 | CONFIG_CGROUP_MEMCG=y |
15 | CONFIG_RELAY=y | 14 | CONFIG_RELAY=y |
16 | CONFIG_NAMESPACES=y | 15 | CONFIG_NAMESPACES=y |
diff --git a/arch/sh/configs/shx3_defconfig b/arch/sh/configs/shx3_defconfig index cd6c519f8fad..4a4269ad5b04 100644 --- a/arch/sh/configs/shx3_defconfig +++ b/arch/sh/configs/shx3_defconfig | |||
@@ -12,7 +12,6 @@ CONFIG_CGROUPS=y | |||
12 | CONFIG_CGROUP_FREEZER=y | 12 | CONFIG_CGROUP_FREEZER=y |
13 | CONFIG_CGROUP_DEVICE=y | 13 | CONFIG_CGROUP_DEVICE=y |
14 | CONFIG_CGROUP_CPUACCT=y | 14 | CONFIG_CGROUP_CPUACCT=y |
15 | CONFIG_RESOURCE_COUNTERS=y | ||
16 | CONFIG_CGROUP_MEMCG=y | 15 | CONFIG_CGROUP_MEMCG=y |
17 | CONFIG_RELAY=y | 16 | CONFIG_RELAY=y |
18 | CONFIG_NAMESPACES=y | 17 | CONFIG_NAMESPACES=y |
diff --git a/arch/sh/configs/urquell_defconfig b/arch/sh/configs/urquell_defconfig index 1e843dbed5f0..01c9a91ee896 100644 --- a/arch/sh/configs/urquell_defconfig +++ b/arch/sh/configs/urquell_defconfig | |||
@@ -14,7 +14,6 @@ CONFIG_CGROUP_DEVICE=y | |||
14 | CONFIG_CPUSETS=y | 14 | CONFIG_CPUSETS=y |
15 | # CONFIG_PROC_PID_CPUSET is not set | 15 | # CONFIG_PROC_PID_CPUSET is not set |
16 | CONFIG_CGROUP_CPUACCT=y | 16 | CONFIG_CGROUP_CPUACCT=y |
17 | CONFIG_RESOURCE_COUNTERS=y | ||
18 | CONFIG_CGROUP_MEMCG=y | 17 | CONFIG_CGROUP_MEMCG=y |
19 | CONFIG_CGROUP_MEMCG_SWAP=y | 18 | CONFIG_CGROUP_MEMCG_SWAP=y |
20 | CONFIG_CGROUP_SCHED=y | 19 | CONFIG_CGROUP_SCHED=y |
diff --git a/arch/tile/configs/tilegx_defconfig b/arch/tile/configs/tilegx_defconfig index 718905557f7e..48357a4e30a0 100644 --- a/arch/tile/configs/tilegx_defconfig +++ b/arch/tile/configs/tilegx_defconfig | |||
@@ -16,7 +16,6 @@ CONFIG_CGROUP_DEBUG=y | |||
16 | CONFIG_CGROUP_DEVICE=y | 16 | CONFIG_CGROUP_DEVICE=y |
17 | CONFIG_CPUSETS=y | 17 | CONFIG_CPUSETS=y |
18 | CONFIG_CGROUP_CPUACCT=y | 18 | CONFIG_CGROUP_CPUACCT=y |
19 | CONFIG_RESOURCE_COUNTERS=y | ||
20 | CONFIG_CGROUP_SCHED=y | 19 | CONFIG_CGROUP_SCHED=y |
21 | CONFIG_RT_GROUP_SCHED=y | 20 | CONFIG_RT_GROUP_SCHED=y |
22 | CONFIG_BLK_CGROUP=y | 21 | CONFIG_BLK_CGROUP=y |
diff --git a/arch/tile/configs/tilepro_defconfig b/arch/tile/configs/tilepro_defconfig index dc85468afd5e..a56c58424a22 100644 --- a/arch/tile/configs/tilepro_defconfig +++ b/arch/tile/configs/tilepro_defconfig | |||
@@ -15,7 +15,6 @@ CONFIG_CGROUP_DEBUG=y | |||
15 | CONFIG_CGROUP_DEVICE=y | 15 | CONFIG_CGROUP_DEVICE=y |
16 | CONFIG_CPUSETS=y | 16 | CONFIG_CPUSETS=y |
17 | CONFIG_CGROUP_CPUACCT=y | 17 | CONFIG_CGROUP_CPUACCT=y |
18 | CONFIG_RESOURCE_COUNTERS=y | ||
19 | CONFIG_CGROUP_SCHED=y | 18 | CONFIG_CGROUP_SCHED=y |
20 | CONFIG_RT_GROUP_SCHED=y | 19 | CONFIG_RT_GROUP_SCHED=y |
21 | CONFIG_BLK_CGROUP=y | 20 | CONFIG_BLK_CGROUP=y |
diff --git a/arch/um/configs/i386_defconfig b/arch/um/configs/i386_defconfig index a12bf68c9f3a..5636221b8785 100644 --- a/arch/um/configs/i386_defconfig +++ b/arch/um/configs/i386_defconfig | |||
@@ -17,7 +17,6 @@ CONFIG_CGROUP_FREEZER=y | |||
17 | CONFIG_CGROUP_DEVICE=y | 17 | CONFIG_CGROUP_DEVICE=y |
18 | CONFIG_CPUSETS=y | 18 | CONFIG_CPUSETS=y |
19 | CONFIG_CGROUP_CPUACCT=y | 19 | CONFIG_CGROUP_CPUACCT=y |
20 | CONFIG_RESOURCE_COUNTERS=y | ||
21 | CONFIG_CGROUP_SCHED=y | 20 | CONFIG_CGROUP_SCHED=y |
22 | CONFIG_BLK_CGROUP=y | 21 | CONFIG_BLK_CGROUP=y |
23 | # CONFIG_PID_NS is not set | 22 | # CONFIG_PID_NS is not set |
diff --git a/arch/um/configs/x86_64_defconfig b/arch/um/configs/x86_64_defconfig index 3aab117bd553..7a67b7ac1a7e 100644 --- a/arch/um/configs/x86_64_defconfig +++ b/arch/um/configs/x86_64_defconfig | |||
@@ -15,7 +15,6 @@ CONFIG_CGROUP_FREEZER=y | |||
15 | CONFIG_CGROUP_DEVICE=y | 15 | CONFIG_CGROUP_DEVICE=y |
16 | CONFIG_CPUSETS=y | 16 | CONFIG_CPUSETS=y |
17 | CONFIG_CGROUP_CPUACCT=y | 17 | CONFIG_CGROUP_CPUACCT=y |
18 | CONFIG_RESOURCE_COUNTERS=y | ||
19 | CONFIG_CGROUP_SCHED=y | 18 | CONFIG_CGROUP_SCHED=y |
20 | CONFIG_BLK_CGROUP=y | 19 | CONFIG_BLK_CGROUP=y |
21 | # CONFIG_PID_NS is not set | 20 | # CONFIG_PID_NS is not set |
diff --git a/arch/x86/configs/i386_defconfig b/arch/x86/configs/i386_defconfig index 265901a84f3f..5fa6ee2c2dde 100644 --- a/arch/x86/configs/i386_defconfig +++ b/arch/x86/configs/i386_defconfig | |||
@@ -17,7 +17,6 @@ CONFIG_CGROUPS=y | |||
17 | CONFIG_CGROUP_FREEZER=y | 17 | CONFIG_CGROUP_FREEZER=y |
18 | CONFIG_CPUSETS=y | 18 | CONFIG_CPUSETS=y |
19 | CONFIG_CGROUP_CPUACCT=y | 19 | CONFIG_CGROUP_CPUACCT=y |
20 | CONFIG_RESOURCE_COUNTERS=y | ||
21 | CONFIG_CGROUP_SCHED=y | 20 | CONFIG_CGROUP_SCHED=y |
22 | CONFIG_BLK_DEV_INITRD=y | 21 | CONFIG_BLK_DEV_INITRD=y |
23 | # CONFIG_COMPAT_BRK is not set | 22 | # CONFIG_COMPAT_BRK is not set |
diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig index 0c8d7963483c..d28bdabcc87e 100644 --- a/arch/x86/configs/x86_64_defconfig +++ b/arch/x86/configs/x86_64_defconfig | |||
@@ -16,7 +16,6 @@ CONFIG_CGROUPS=y | |||
16 | CONFIG_CGROUP_FREEZER=y | 16 | CONFIG_CGROUP_FREEZER=y |
17 | CONFIG_CPUSETS=y | 17 | CONFIG_CPUSETS=y |
18 | CONFIG_CGROUP_CPUACCT=y | 18 | CONFIG_CGROUP_CPUACCT=y |
19 | CONFIG_RESOURCE_COUNTERS=y | ||
20 | CONFIG_CGROUP_SCHED=y | 19 | CONFIG_CGROUP_SCHED=y |
21 | CONFIG_BLK_DEV_INITRD=y | 20 | CONFIG_BLK_DEV_INITRD=y |
22 | # CONFIG_COMPAT_BRK is not set | 21 | # CONFIG_COMPAT_BRK is not set |
diff --git a/arch/xtensa/configs/generic_kc705_defconfig b/arch/xtensa/configs/generic_kc705_defconfig index f4b7b3888da8..d9444f01f4da 100644 --- a/arch/xtensa/configs/generic_kc705_defconfig +++ b/arch/xtensa/configs/generic_kc705_defconfig | |||
@@ -11,7 +11,6 @@ CONFIG_CGROUP_FREEZER=y | |||
11 | CONFIG_CGROUP_DEVICE=y | 11 | CONFIG_CGROUP_DEVICE=y |
12 | CONFIG_CPUSETS=y | 12 | CONFIG_CPUSETS=y |
13 | CONFIG_CGROUP_CPUACCT=y | 13 | CONFIG_CGROUP_CPUACCT=y |
14 | CONFIG_RESOURCE_COUNTERS=y | ||
15 | CONFIG_MEMCG=y | 14 | CONFIG_MEMCG=y |
16 | CONFIG_NAMESPACES=y | 15 | CONFIG_NAMESPACES=y |
17 | CONFIG_SCHED_AUTOGROUP=y | 16 | CONFIG_SCHED_AUTOGROUP=y |
diff --git a/arch/xtensa/configs/smp_lx200_defconfig b/arch/xtensa/configs/smp_lx200_defconfig index 22eeacba37cc..61f943c95619 100644 --- a/arch/xtensa/configs/smp_lx200_defconfig +++ b/arch/xtensa/configs/smp_lx200_defconfig | |||
@@ -11,7 +11,6 @@ CONFIG_CGROUP_FREEZER=y | |||
11 | CONFIG_CGROUP_DEVICE=y | 11 | CONFIG_CGROUP_DEVICE=y |
12 | CONFIG_CPUSETS=y | 12 | CONFIG_CPUSETS=y |
13 | CONFIG_CGROUP_CPUACCT=y | 13 | CONFIG_CGROUP_CPUACCT=y |
14 | CONFIG_RESOURCE_COUNTERS=y | ||
15 | CONFIG_MEMCG=y | 14 | CONFIG_MEMCG=y |
16 | CONFIG_NAMESPACES=y | 15 | CONFIG_NAMESPACES=y |
17 | CONFIG_SCHED_AUTOGROUP=y | 16 | CONFIG_SCHED_AUTOGROUP=y |