Skip to content

Commit 7b304b7

Browse files
committed
Revert "config: Add SECOMP options from raspberrypi#1698"
This reverts commit bfc4080.
1 parent 634afa8 commit 7b304b7

File tree

2 files changed

+2
-13
lines changed

2 files changed

+2
-13
lines changed

arch/arm/configs/bcm2709_defconfig

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,11 @@ CONFIG_IKCONFIG=m
1414
CONFIG_IKCONFIG_PROC=y
1515
CONFIG_NMI_LOG_BUF_SHIFT=12
1616
CONFIG_MEMCG=y
17-
CONFIG_MEMCG_SWAP=y
1817
CONFIG_BLK_CGROUP=y
19-
CONFIG_CFS_BANDWIDTH=y
20-
CONFIG_CGROUP_PIDS=y
2118
CONFIG_CGROUP_FREEZER=y
2219
CONFIG_CPUSETS=y
2320
CONFIG_CGROUP_DEVICE=y
2421
CONFIG_CGROUP_CPUACCT=y
25-
CONFIG_CGROUP_PERF=y
2622
CONFIG_NAMESPACES=y
2723
CONFIG_USER_NS=y
2824
CONFIG_SCHED_AUTOGROUP=y
@@ -48,6 +44,7 @@ CONFIG_SMP=y
4844
CONFIG_VMSPLIT_2G=y
4945
CONFIG_PREEMPT_VOLUNTARY=y
5046
CONFIG_AEABI=y
47+
CONFIG_OABI_COMPAT=y
5148
# CONFIG_CPU_SW_DOMAIN_PAN is not set
5249
CONFIG_CLEANCACHE=y
5350
CONFIG_FRONTSWAP=y
@@ -345,7 +342,6 @@ CONFIG_NET_ACT_SKBEDIT=m
345342
CONFIG_NET_ACT_CSUM=m
346343
CONFIG_BATMAN_ADV=m
347344
CONFIG_OPENVSWITCH=m
348-
CONFIG_CGROUP_NET_PRIO=y
349345
CONFIG_NET_PKTGEN=m
350346
CONFIG_HAMRADIO=y
351347
CONFIG_AX25=m
@@ -1284,8 +1280,6 @@ CONFIG_FUNCTION_PROFILER=y
12841280
CONFIG_KGDB=y
12851281
CONFIG_KGDB_KDB=y
12861282
CONFIG_KDB_KEYBOARD=y
1287-
CONFIG_SECURITY=y
1288-
CONFIG_SECURITY_APPARMOR=y
12891283
CONFIG_CRYPTO_USER=m
12901284
CONFIG_CRYPTO_CBC=y
12911285
CONFIG_CRYPTO_CTS=m

arch/arm/configs/bcmrpi_defconfig

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,11 @@ CONFIG_IKCONFIG=m
1313
CONFIG_IKCONFIG_PROC=y
1414
CONFIG_NMI_LOG_BUF_SHIFT=12
1515
CONFIG_MEMCG=y
16-
CONFIG_MEMCG_SWAP=y
1716
CONFIG_BLK_CGROUP=y
18-
CONFIG_CGROUP_PIDS=y
1917
CONFIG_CGROUP_FREEZER=y
2018
CONFIG_CPUSETS=y
2119
CONFIG_CGROUP_DEVICE=y
2220
CONFIG_CGROUP_CPUACCT=y
23-
CONFIG_CGROUP_PERF=y
2421
CONFIG_NAMESPACES=y
2522
CONFIG_USER_NS=y
2623
CONFIG_SCHED_AUTOGROUP=y
@@ -46,6 +43,7 @@ CONFIG_ARCH_BCM2835=y
4643
# CONFIG_CACHE_L2X0 is not set
4744
CONFIG_PREEMPT_VOLUNTARY=y
4845
CONFIG_AEABI=y
46+
CONFIG_OABI_COMPAT=y
4947
# CONFIG_CPU_SW_DOMAIN_PAN is not set
5048
CONFIG_CLEANCACHE=y
5149
CONFIG_FRONTSWAP=y
@@ -340,7 +338,6 @@ CONFIG_NET_ACT_SKBEDIT=m
340338
CONFIG_NET_ACT_CSUM=m
341339
CONFIG_BATMAN_ADV=m
342340
CONFIG_OPENVSWITCH=m
343-
CONFIG_CGROUP_NET_PRIO=y
344341
CONFIG_NET_PKTGEN=m
345342
CONFIG_HAMRADIO=y
346343
CONFIG_AX25=m
@@ -1294,8 +1291,6 @@ CONFIG_FUNCTION_PROFILER=y
12941291
CONFIG_KGDB=y
12951292
CONFIG_KGDB_KDB=y
12961293
CONFIG_KDB_KEYBOARD=y
1297-
CONFIG_SECURITY=y
1298-
CONFIG_SECURITY_APPARMOR=y
12991294
CONFIG_CRYPTO_USER=m
13001295
CONFIG_CRYPTO_CRYPTD=m
13011296
CONFIG_CRYPTO_CBC=y

0 commit comments

Comments
 (0)