Merge branch 'parisc-5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[linux-block.git] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index 4ec0f3dbfb1189e1a029c3a87b280e01b24c514b..4275c25b5d8afc5d96cf5e6b733d2f7e0e0daf92 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -707,19 +707,6 @@ config ZSMALLOC
          returned by an alloc().  This handle must be mapped in order to
          access the allocated space.
 
-config ZSMALLOC_PGTABLE_MAPPING
-       bool "Use page table mapping to access object in zsmalloc"
-       depends on ZSMALLOC=y
-       help
-         By default, zsmalloc uses a copy-based object mapping method to
-         access allocations that span two pages. However, if a particular
-         architecture (ex, ARM) performs VM mapping faster than copying,
-         then you should select this. This causes zsmalloc to use page table
-         mapping rather than copying for object mapping.
-
-         You can check speed with zsmalloc benchmark:
-         https://github.com/spartacus06/zsmapbench
-
 config ZSMALLOC_STAT
        bool "Export zsmalloc statistics"
        depends on ZSMALLOC
@@ -832,13 +819,28 @@ config PERCPU_STATS
          information includes global and per chunk statistics, which can
          be used to help understand percpu memory usage.
 
-config GUP_BENCHMARK
-       bool "Enable infrastructure for get_user_pages() and related calls benchmarking"
+config GUP_TEST
+       bool "Enable infrastructure for get_user_pages()-related unit tests"
+       depends on DEBUG_FS
        help
-         Provides /sys/kernel/debug/gup_benchmark that helps with testing
-         performance of get_user_pages() and related calls.
+         Provides /sys/kernel/debug/gup_test, which in turn provides a way
+         to make ioctl calls that can launch kernel-based unit tests for
+         the get_user_pages*() and pin_user_pages*() family of API calls.
+
+         These tests include benchmark testing of the _fast variants of
+         get_user_pages*() and pin_user_pages*(), as well as smoke tests of
+         the non-_fast variants.
 
-         See tools/testing/selftests/vm/gup_benchmark.c
+         There is also a sub-test that allows running dump_page() on any
+         of up to eight pages (selected by command line args) within the
+         range of user-space addresses. These pages are either pinned via
+         pin_user_pages*(), or pinned via get_user_pages*(), as specified
+         by other command line arguments.
+
+         See tools/testing/selftests/vm/gup_test.c
+
+comment "GUP_TEST needs to have DEBUG_FS enabled"
+       depends on !GUP_TEST && !DEBUG_FS
 
 config GUP_GET_PTE_LOW_HIGH
        bool
@@ -870,4 +872,7 @@ config ARCH_HAS_HUGEPD
 config MAPPING_DIRTY_HELPERS
         bool
 
+config KMAP_LOCAL
+       bool
+
 endmenu