1 files changed, 55 insertions, 2 deletions

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 839f48c26ef0..f3b584be76d7 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -1,7 +1,6 @@
 config ARM64
         def_bool y
         select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
-        select ARCH_HAS_OPP
         select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
         select ARCH_USE_CMPXCHG_LOCKREF
         select ARCH_SUPPORTS_ATOMIC_RMW
@@ -11,6 +10,8 @@ config ARM64
         select ARM_AMBA
         select ARM_ARCH_TIMER
         select ARM_GIC
+        select AUDIT_ARCH_COMPAT_GENERIC
+        select ARM_GIC_V3
         select BUILDTIME_EXTABLE_SORT
         select CLONE_BACKWARDS
         select COMMON_CLK
@@ -29,10 +30,12 @@ config ARM64
         select GENERIC_STRNLEN_USER
         select GENERIC_TIME_VSYSCALL
         select HARDIRQS_SW_RESEND
+        select HAVE_ARCH_AUDITSYSCALL
         select HAVE_ARCH_JUMP_LABEL
         select HAVE_ARCH_KGDB
         select HAVE_ARCH_TRACEHOOK
         select HAVE_C_RECORDMCOUNT
+        select HAVE_CC_STACKPROTECTOR
         select HAVE_DEBUG_BUGVERBOSE
         select HAVE_DEBUG_KMEMLEAK
         select HAVE_DMA_API_DEBUG
@@ -63,6 +66,7 @@ config ARM64
         select RTC_LIB
         select SPARSE_IRQ
         select SYSCTL_EXCEPTION_TRACE
+        select HAVE_CONTEXT_TRACKING
         help
           ARM 64-bit (AArch64) Linux support.
 
@@ -155,14 +159,63 @@ endmenu
 
 menu "Kernel Features"
 
+choice
+        prompt "Page size"
+        default ARM64_4K_PAGES
+        help
+          Page size (translation granule) configuration.
+
+config ARM64_4K_PAGES
+        bool "4KB"
+        help
+          This feature enables 4KB pages support.
+
 config ARM64_64K_PAGES
-        bool "Enable 64KB pages support"
+        bool "64KB"
         help
           This feature enables 64KB pages support (4KB by default)
           allowing only two levels of page tables and faster TLB
           look-up. AArch32 emulation is not available when this feature
           is enabled.
 
+endchoice
+
+choice
+        prompt "Virtual address space size"
+        default ARM64_VA_BITS_39 if ARM64_4K_PAGES
+        default ARM64_VA_BITS_42 if ARM64_64K_PAGES
+        help
+          Allows choosing one of multiple possible virtual address
+          space sizes. The level of translation table is determined by
+          a combination of page size and virtual address space size.
+
+config ARM64_VA_BITS_39
+        bool "39-bit"
+        depends on ARM64_4K_PAGES
+
+config ARM64_VA_BITS_42
+        bool "42-bit"
+        depends on ARM64_64K_PAGES
+
+config ARM64_VA_BITS_48
+        bool "48-bit"
+        depends on BROKEN
+
+endchoice
+
+config ARM64_VA_BITS
+        int
+        default 39 if ARM64_VA_BITS_39
+        default 42 if ARM64_VA_BITS_42
+        default 48 if ARM64_VA_BITS_48
+
+config ARM64_PGTABLE_LEVELS
+        int
+        default 2 if ARM64_64K_PAGES && ARM64_VA_BITS_42
+        default 3 if ARM64_64K_PAGES && ARM64_VA_BITS_48
+        default 3 if ARM64_4K_PAGES && ARM64_VA_BITS_39
+        default 4 if ARM64_4K_PAGES && ARM64_VA_BITS_48
+
 config CPU_BIG_ENDIAN
        bool "Build big-endian kernel"
        help