From 2d6f664ffb6001ae01e901f6b365d852dba9a4a6 Mon Sep 17 00:00:00 2001 From: Nicolas Boichat Date: Fri, 22 Jan 2016 15:45:23 +0800 Subject: [PATCH] CHROMIUM: config: renormalize splitconfigs Run chromeos/scripts/kernelconfig oldconfig and accept defaults. BUG=none TEST=none Change-Id: Ie7f6bb86f96620b16f64e43c446fd63a00dfac83 Signed-off-by: Nicolas Boichat Reviewed-on: https://chromium-review.googlesource.com/323078 Reviewed-by: Daniel Cashman --- chromeos/config/arm64/common.config | 8 ++++++++ chromeos/config/armel/common.config | 4 ++++ chromeos/config/base.config | 1 + chromeos/config/i386/common.config | 6 ++++++ chromeos/config/x86_64/common.config | 8 ++++++++ 5 files changed, 27 insertions(+) diff --git a/chromeos/config/arm64/common.config b/chromeos/config/arm64/common.config index 859b173d8221c..547b0c57db064 100644 --- a/chromeos/config/arm64/common.config +++ b/chromeos/config/arm64/common.config @@ -77,6 +77,12 @@ CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y CONFIG_ARCH_HAS_SG_CHAIN=y CONFIG_ARCH_HAS_TICK_BROADCAST=y +CONFIG_ARCH_MMAP_RND_BITS=18 +CONFIG_ARCH_MMAP_RND_BITS_MAX=24 +CONFIG_ARCH_MMAP_RND_BITS_MIN=18 +CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11 +CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16 +CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11 # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set CONFIG_ARCH_PHYS_ADDR_T_64BIT=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y @@ -390,6 +396,8 @@ CONFIG_HARDLOCKUP_DETECTOR_OTHER_CPU=y # CONFIG_HAVE_AOUT is not set CONFIG_HAVE_ARCH_AUDITSYSCALL=y CONFIG_HAVE_ARCH_KASAN=y +CONFIG_HAVE_ARCH_MMAP_RND_BITS=y +CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y CONFIG_HAVE_ARCH_PFN_VALID=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y CONFIG_HAVE_BPF_JIT=y diff --git a/chromeos/config/armel/common.config b/chromeos/config/armel/common.config index 701b04d6db2db..3b534233839a4 100644 --- a/chromeos/config/armel/common.config +++ b/chromeos/config/armel/common.config @@ -101,6 +101,9 @@ CONFIG_ARCH_HIBERNATION_POSSIBLE=y # CONFIG_ARCH_MEDIATEK is not set # CONFIG_ARCH_MESON is not set CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y +CONFIG_ARCH_MMAP_RND_BITS=8 +CONFIG_ARCH_MMAP_RND_BITS_MAX=16 +CONFIG_ARCH_MMAP_RND_BITS_MIN=8 # CONFIG_ARCH_MMP is not set # CONFIG_ARCH_MSM is not set CONFIG_ARCH_MULTIPLATFORM=y @@ -374,6 +377,7 @@ CONFIG_HARDLOCKUP_DETECTOR_OTHER_CPU=y CONFIG_HAS_IOPORT_MAP=y # CONFIG_HAVE_AOUT is not set CONFIG_HAVE_ARCH_AUDITSYSCALL=y +CONFIG_HAVE_ARCH_MMAP_RND_BITS=y CONFIG_HAVE_ARCH_PFN_VALID=y CONFIG_HAVE_ARM_ARCH_TIMER=y CONFIG_HAVE_ARM_SCU=y diff --git a/chromeos/config/base.config b/chromeos/config/base.config index 5d5df4c163f97..0b5d6f943f164 100644 --- a/chromeos/config/base.config +++ b/chromeos/config/base.config @@ -1368,6 +1368,7 @@ CONFIG_SECURITY=y CONFIG_SECURITYFS=y # CONFIG_SECURITY_APPARMOR is not set CONFIG_SECURITY_CHROMIUMOS=y +CONFIG_SECURITY_CHROMIUMOS_NO_SYMLINK_MOUNT=y # CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITY_NETWORK=y # CONFIG_SECURITY_NETWORK_XFRM is not set diff --git a/chromeos/config/i386/common.config b/chromeos/config/i386/common.config index 22a67b6638468..3ea87497efe1f 100644 --- a/chromeos/config/i386/common.config +++ b/chromeos/config/i386/common.config @@ -149,6 +149,11 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y +CONFIG_ARCH_MMAP_RND_BITS=8 +CONFIG_ARCH_MMAP_RND_BITS_MAX=16 +CONFIG_ARCH_MMAP_RND_BITS_MIN=8 +CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16 +CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8 # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set CONFIG_ARCH_PHYS_ADDR_T_64BIT=y CONFIG_ARCH_RANDOM=y @@ -560,6 +565,7 @@ CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y CONFIG_HAVE_AOUT=y CONFIG_HAVE_ARCH_AUDITSYSCALL=y CONFIG_HAVE_ARCH_KMEMCHECK=y +CONFIG_HAVE_ARCH_MMAP_RND_BITS=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y CONFIG_HAVE_ATOMIC_IOMAP=y CONFIG_HAVE_CMPXCHG_DOUBLE=y diff --git a/chromeos/config/x86_64/common.config b/chromeos/config/x86_64/common.config index 5d4109b859a78..d61cc5d48ab8c 100644 --- a/chromeos/config/x86_64/common.config +++ b/chromeos/config/x86_64/common.config @@ -146,6 +146,12 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y +CONFIG_ARCH_MMAP_RND_BITS=28 +CONFIG_ARCH_MMAP_RND_BITS_MAX=32 +CONFIG_ARCH_MMAP_RND_BITS_MIN=28 +CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8 +CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16 +CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8 # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set CONFIG_ARCH_PHYS_ADDR_T_64BIT=y CONFIG_ARCH_PROC_KCORE_TEXT=y @@ -638,6 +644,8 @@ CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y CONFIG_HAVE_ARCH_AUDITSYSCALL=y CONFIG_HAVE_ARCH_KASAN=y CONFIG_HAVE_ARCH_KMEMCHECK=y +CONFIG_HAVE_ARCH_MMAP_RND_BITS=y +CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y CONFIG_HAVE_ARCH_SOFT_DIRTY=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y CONFIG_HAVE_BPF_JIT=y