aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMoyster <oysterized@gmail.com>2016-09-18 13:14:50 +0200
committerMoyster <oysterized@gmail.com>2016-09-18 13:14:50 +0200
commit9f1f7e74e397ea5f3d9325ef269d31e99f7322e9 (patch)
tree3e19090af7adba639b4238922629c206fe7008f5
parentfa0268659d6f2f10b1e90cd14ef59a7860a37c8b (diff)
regen defconfig
-rw-r--r--arch/arm64/configs/cm_m2note_defconfig22
1 files changed, 17 insertions, 5 deletions
diff --git a/arch/arm64/configs/cm_m2note_defconfig b/arch/arm64/configs/cm_m2note_defconfig
index 838718648..81ef5de85 100644
--- a/arch/arm64/configs/cm_m2note_defconfig
+++ b/arch/arm64/configs/cm_m2note_defconfig
@@ -9,6 +9,10 @@ CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
CONFIG_MMU=y
CONFIG_NO_IOPORT=y
CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_ARCH_MMAP_RND_BITS_MIN=18
+CONFIG_ARCH_MMAP_RND_BITS_MAX=24
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
CONFIG_LOCKDEP_SUPPORT=y
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -170,13 +174,17 @@ CONFIG_HAVE_DMA_CONTIGUOUS=y
CONFIG_USE_GENERIC_SMP_HELPERS=y
CONFIG_GENERIC_SMP_IDLE_THREAD=y
CONFIG_HAVE_CLK=y
-# CONFIG_HAVE_DMA_API_DEBUG is not set
+CONFIG_HAVE_DMA_API_DEBUG=y
CONFIG_HAVE_HW_BREAKPOINT=y
CONFIG_HAVE_ARCH_JUMP_LABEL=y
CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
CONFIG_SECCOMP_FILTER=y
CONFIG_MODULES_USE_ELF_RELA=y
+CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
+CONFIG_ARCH_MMAP_RND_BITS=18
+CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11
CONFIG_CLONE_BACKWARDS=y
CONFIG_OLD_SIGSUSPEND3=y
CONFIG_COMPAT_OLD_SIGACTION=y
@@ -212,13 +220,13 @@ CONFIG_IOSCHED_DEADLINE=y
# CONFIG_IOSCHED_SIO is not set
CONFIG_IOSCHED_ZEN=y
CONFIG_IOSCHED_CFQ=y
-CONFIG_IOSCHED_FIOPS=y
CONFIG_IOSCHED_SIOPLUS=y
+CONFIG_IOSCHED_FIOPS=y
# CONFIG_DEFAULT_DEADLINE is not set
# CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_FIOPS is not set
# CONFIG_DEFAULT_SIOPLUS is not set
CONFIG_DEFAULT_ZEN=y
+# CONFIG_DEFAULT_FIOPS is not set
# CONFIG_DEFAULT_NOOP is not set
CONFIG_DEFAULT_IOSCHED="zen"
CONFIG_UNINLINE_SPIN_UNLOCK=y
@@ -468,9 +476,9 @@ CONFIG_INET_XFRM_MODE_TUNNEL=y
CONFIG_INET_XFRM_MODE_BEET=y
# CONFIG_INET_LRO is not set
CONFIG_INET_DIAG=y
-CONFIG_INET_DIAG_DESTROY=y
CONFIG_INET_TCP_DIAG=y
# CONFIG_INET_UDP_DIAG is not set
+CONFIG_INET_DIAG_DESTROY=y
# CONFIG_TCP_CONG_ADVANCED is not set
CONFIG_TCP_CONG_CUBIC=y
CONFIG_DEFAULT_TCP_CONG="cubic"
@@ -740,6 +748,9 @@ CONFIG_NET_SCH_HTB=y
# CONFIG_NET_SCH_QFQ is not set
# CONFIG_NET_SCH_CODEL is not set
# CONFIG_NET_SCH_FQ_CODEL is not set
+# CONFIG_NET_SCH_FQ is not set
+# CONFIG_NET_SCH_HHF is not set
+# CONFIG_NET_SCH_PIE is not set
CONFIG_NET_SCH_INGRESS=y
# CONFIG_NET_SCH_PLUG is not set
@@ -985,9 +996,9 @@ CONFIG_UID_STAT=y
CONFIG_MUIC_TSU6721=y
# CONFIG_LATTICE_ECP3_CONFIG is not set
# CONFIG_SRAM is not set
-CONFIG_UID_CPUTIME=y
CONFIG_LTR559=y
CONFIG_THUNDERQUAKE_ENGINE_GPL=y
+CONFIG_UID_CPUTIME=y
# CONFIG_C2PORT is not set
#
@@ -3263,6 +3274,7 @@ CONFIG_CRC32_SLICEBY8=y
CONFIG_LIBCRC32C=y
# CONFIG_CRC8 is not set
CONFIG_AUDIT_GENERIC=y
+# CONFIG_RANDOM32_SELFTEST is not set
CONFIG_ZLIB_INFLATE=y
CONFIG_ZLIB_DEFLATE=y
CONFIG_LZO_COMPRESS=y