Skip to content

Commit 67fd2b5

Browse files
committed
config: Add SECOMP options from #1698
1 parent 8d6161c commit 67fd2b5

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

arch/arm/configs/bcm2709_defconfig

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,15 @@ CONFIG_IKCONFIG=m
1414
CONFIG_IKCONFIG_PROC=y
1515
CONFIG_NMI_LOG_BUF_SHIFT=12
1616
CONFIG_MEMCG=y
17+
CONFIG_MEMCG_SWAP=y
1718
CONFIG_BLK_CGROUP=y
19+
CONFIG_CFS_BANDWIDTH=y
20+
CONFIG_CGROUP_PIDS=y
1821
CONFIG_CGROUP_FREEZER=y
1922
CONFIG_CPUSETS=y
2023
CONFIG_CGROUP_DEVICE=y
2124
CONFIG_CGROUP_CPUACCT=y
25+
CONFIG_CGROUP_PERF=y
2226
CONFIG_NAMESPACES=y
2327
CONFIG_USER_NS=y
2428
CONFIG_SCHED_AUTOGROUP=y
@@ -44,7 +48,6 @@ CONFIG_SMP=y
4448
CONFIG_VMSPLIT_2G=y
4549
CONFIG_PREEMPT_VOLUNTARY=y
4650
CONFIG_AEABI=y
47-
CONFIG_OABI_COMPAT=y
4851
# CONFIG_CPU_SW_DOMAIN_PAN is not set
4952
CONFIG_CLEANCACHE=y
5053
CONFIG_FRONTSWAP=y
@@ -342,6 +345,7 @@ CONFIG_NET_ACT_SKBEDIT=m
342345
CONFIG_NET_ACT_CSUM=m
343346
CONFIG_BATMAN_ADV=m
344347
CONFIG_OPENVSWITCH=m
348+
CONFIG_CGROUP_NET_PRIO=y
345349
CONFIG_NET_PKTGEN=m
346350
CONFIG_HAMRADIO=y
347351
CONFIG_AX25=m
@@ -1278,6 +1282,8 @@ CONFIG_FUNCTION_PROFILER=y
12781282
CONFIG_KGDB=y
12791283
CONFIG_KGDB_KDB=y
12801284
CONFIG_KDB_KEYBOARD=y
1285+
CONFIG_SECURITY=y
1286+
CONFIG_SECURITY_APPARMOR=y
12811287
CONFIG_CRYPTO_USER=m
12821288
CONFIG_CRYPTO_CBC=y
12831289
CONFIG_CRYPTO_CTS=m

arch/arm/configs/bcmrpi_defconfig

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,14 @@ CONFIG_IKCONFIG=m
1313
CONFIG_IKCONFIG_PROC=y
1414
CONFIG_NMI_LOG_BUF_SHIFT=12
1515
CONFIG_MEMCG=y
16+
CONFIG_MEMCG_SWAP=y
1617
CONFIG_BLK_CGROUP=y
18+
CONFIG_CGROUP_PIDS=y
1719
CONFIG_CGROUP_FREEZER=y
1820
CONFIG_CPUSETS=y
1921
CONFIG_CGROUP_DEVICE=y
2022
CONFIG_CGROUP_CPUACCT=y
23+
CONFIG_CGROUP_PERF=y
2124
CONFIG_NAMESPACES=y
2225
CONFIG_USER_NS=y
2326
CONFIG_SCHED_AUTOGROUP=y
@@ -43,7 +46,6 @@ CONFIG_ARCH_BCM2708=y
4346
# CONFIG_CACHE_L2X0 is not set
4447
CONFIG_PREEMPT_VOLUNTARY=y
4548
CONFIG_AEABI=y
46-
CONFIG_OABI_COMPAT=y
4749
# CONFIG_CPU_SW_DOMAIN_PAN is not set
4850
CONFIG_CLEANCACHE=y
4951
CONFIG_FRONTSWAP=y
@@ -338,6 +340,7 @@ CONFIG_NET_ACT_SKBEDIT=m
338340
CONFIG_NET_ACT_CSUM=m
339341
CONFIG_BATMAN_ADV=m
340342
CONFIG_OPENVSWITCH=m
343+
CONFIG_CGROUP_NET_PRIO=y
341344
CONFIG_NET_PKTGEN=m
342345
CONFIG_HAMRADIO=y
343346
CONFIG_AX25=m
@@ -1289,6 +1292,8 @@ CONFIG_FUNCTION_PROFILER=y
12891292
CONFIG_KGDB=y
12901293
CONFIG_KGDB_KDB=y
12911294
CONFIG_KDB_KEYBOARD=y
1295+
CONFIG_SECURITY=y
1296+
CONFIG_SECURITY_APPARMOR=y
12921297
CONFIG_CRYPTO_USER=m
12931298
CONFIG_CRYPTO_CRYPTD=m
12941299
CONFIG_CRYPTO_CBC=y

0 commit comments

Comments
 (0)