aboutsummaryrefslogtreecommitdiffstats
path: root/dashboard/config/linux/upstream-arm64-mte-base.config
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2021-10-21 11:07:34 +0200
committerDmitry Vyukov <dvyukov@google.com>2021-10-21 15:05:29 +0200
commit35d15c46245e9a7bc90954d0197ec0d724c744af (patch)
tree5e915676f9d0789352db17e5de170ccc9945dcbd /dashboard/config/linux/upstream-arm64-mte-base.config
parent551fb3f0cdc7f2b2baa1221b06c2c21f6dd95797 (diff)
dashboard/config/linux: add secretmem_enable to cmdline
secretmem_enable is required to enable memfd_secret syscall: https://elixir.bootlin.com/linux/v5.15-rc6/source/mm/secretmem.c#L202 (the android 5.10 base config was not generated on HEAD somehow)
Diffstat (limited to 'dashboard/config/linux/upstream-arm64-mte-base.config')
-rw-r--r--dashboard/config/linux/upstream-arm64-mte-base.config2
1 files changed, 1 insertions, 1 deletions
diff --git a/dashboard/config/linux/upstream-arm64-mte-base.config b/dashboard/config/linux/upstream-arm64-mte-base.config
index f6348a9b0..2262367b5 100644
--- a/dashboard/config/linux/upstream-arm64-mte-base.config
+++ b/dashboard/config/linux/upstream-arm64-mte-base.config
@@ -489,7 +489,7 @@ CONFIG_STACKPROTECTOR_PER_TASK=y
# Boot options
#
# CONFIG_ARM64_ACPI_PARKING_PROTOCOL is not set
-CONFIG_CMDLINE="earlyprintk=serial net.ifnames=0 sysctl.kernel.hung_task_all_cpu_backtrace=1 ima_policy=tcb nf-conntrack-ftp.ports=20000 nf-conntrack-tftp.ports=20000 nf-conntrack-sip.ports=20000 nf-conntrack-irc.ports=20000 nf-conntrack-sane.ports=20000 binder.debug_mask=0 rcupdate.rcu_expedited=1 no_hash_pointers page_owner=on sysctl.vm.nr_hugepages=4 sysctl.vm.nr_overcommit_hugepages=4 root=/dev/vda console=ttyAMA0 watchdog_thresh=165 workqueue.watchdog_thresh=420 sysctl.net.core.netdev_unregister_timeout_secs=420 dummy_hcd.num=2"
+CONFIG_CMDLINE="earlyprintk=serial net.ifnames=0 sysctl.kernel.hung_task_all_cpu_backtrace=1 ima_policy=tcb nf-conntrack-ftp.ports=20000 nf-conntrack-tftp.ports=20000 nf-conntrack-sip.ports=20000 nf-conntrack-irc.ports=20000 nf-conntrack-sane.ports=20000 binder.debug_mask=0 rcupdate.rcu_expedited=1 no_hash_pointers page_owner=on sysctl.vm.nr_hugepages=4 sysctl.vm.nr_overcommit_hugepages=4 secretmem_enable root=/dev/vda console=ttyAMA0 watchdog_thresh=165 workqueue.watchdog_thresh=420 sysctl.net.core.netdev_unregister_timeout_secs=420 dummy_hcd.num=2"
CONFIG_CMDLINE_FROM_BOOTLOADER=y
# CONFIG_CMDLINE_FORCE is not set
CONFIG_EFI_STUB=y