Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[linux-2.6-microblaze.git] / arch / loongarch / Kconfig

diff --git a/arch/loongarch/Kconfig b/arch/loongarch/Kconfig
index eb21393..c139d0d 100644 (file)
--- a/arch/loongarch/Kconfig
+++ b/arch/loongarch/Kconfig
@@ -226,15 +226,6 @@ config MACH_LOONGSON64
 config FIX_EARLYCON_MEM
        def_bool y
 
-config PAGE_SIZE_4KB
-       bool
-
-config PAGE_SIZE_16KB
-       bool
-
-config PAGE_SIZE_64KB
-       bool
-
 config PGTABLE_2LEVEL
        bool
 
@@ -287,7 +278,7 @@ choice
 
 config 4KB_3LEVEL
        bool "4KB with 3 levels"
-       select PAGE_SIZE_4KB
+       select HAVE_PAGE_SIZE_4KB
        select PGTABLE_3LEVEL
        help
          This option selects 4KB page size with 3 level page tables, which
@@ -295,7 +286,7 @@ config 4KB_3LEVEL
 
 config 4KB_4LEVEL
        bool "4KB with 4 levels"
-       select PAGE_SIZE_4KB
+       select HAVE_PAGE_SIZE_4KB
        select PGTABLE_4LEVEL
        help
          This option selects 4KB page size with 4 level page tables, which
@@ -303,7 +294,7 @@ config 4KB_4LEVEL
 
 config 16KB_2LEVEL
        bool "16KB with 2 levels"
-       select PAGE_SIZE_16KB
+       select HAVE_PAGE_SIZE_16KB
        select PGTABLE_2LEVEL
        help
          This option selects 16KB page size with 2 level page tables, which
@@ -311,7 +302,7 @@ config 16KB_2LEVEL
 
 config 16KB_3LEVEL
        bool "16KB with 3 levels"
-       select PAGE_SIZE_16KB
+       select HAVE_PAGE_SIZE_16KB
        select PGTABLE_3LEVEL
        help
          This option selects 16KB page size with 3 level page tables, which
@@ -319,7 +310,7 @@ config 16KB_3LEVEL
 
 config 64KB_2LEVEL
        bool "64KB with 2 levels"
-       select PAGE_SIZE_64KB
+       select HAVE_PAGE_SIZE_64KB
        select PGTABLE_2LEVEL
        help
          This option selects 64KB page size with 2 level page tables, which
@@ -327,7 +318,7 @@ config 64KB_2LEVEL
 
 config 64KB_3LEVEL
        bool "64KB with 3 levels"
-       select PAGE_SIZE_64KB
+       select HAVE_PAGE_SIZE_64KB
        select PGTABLE_3LEVEL
        help
          This option selects 64KB page size with 3 level page tables, which