Merge tag 'loongarch-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai...

[sfrench/cifs-2.6.git] / arch / loongarch / Kconfig

diff --git a/arch/loongarch/Kconfig b/arch/loongarch/Kconfig
index ac3d3d9b57167eb95de3b8072f2881f6e68d812a..d38b066fc931bc31758ee12d3c3800b6154d0641 100644 (file)
--- a/arch/loongarch/Kconfig
+++ b/arch/loongarch/Kconfig
@@ -54,8 +54,8 @@ config LOONGARCH
        select ARCH_USE_QUEUED_RWLOCKS
        select ARCH_USE_QUEUED_SPINLOCKS
        select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT
-       select ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP
        select ARCH_WANT_LD_ORPHAN_WARN
+       select ARCH_WANT_OPTIMIZE_VMEMMAP
        select ARCH_WANTS_NO_INSTR
        select BUILDTIME_TABLE_SORT
        select COMMON_CLK
@@ -81,6 +81,7 @@ config LOONGARCH
        select GENERIC_SMP_IDLE_THREAD
        select GENERIC_TIME_VSYSCALL
        select GPIOLIB
+       select HAS_IOPORT
        select HAVE_ARCH_AUDITSYSCALL
        select HAVE_ARCH_MMAP_RND_BITS if MMU
        select HAVE_ARCH_SECCOMP_FILTER
@@ -425,12 +426,9 @@ config NODES_SHIFT
 
 config ARCH_FORCE_MAX_ORDER
        int "Maximum zone order"
-       range 14 64 if PAGE_SIZE_64KB
-       default "14" if PAGE_SIZE_64KB
-       range 12 64 if PAGE_SIZE_16KB
-       default "12" if PAGE_SIZE_16KB
-       range 11 64
-       default "11"
+       default "13" if PAGE_SIZE_64KB
+       default "11" if PAGE_SIZE_16KB
+       default "10"
        help
          The kernel memory allocator divides physically contiguous memory
          blocks into "zones", where each zone is a power of two number of
@@ -439,9 +437,6 @@ config ARCH_FORCE_MAX_ORDER
          blocks of physically contiguous memory, then you may need to
          increase this value.
 
-         This config option is actually maximum order plus one. For example,
-         a value of 11 means that the largest free memory block is 2^10 pages.
-
          The page size is not necessarily 4KB.  Keep this in mind
          when choosing a value for this option.