x86/msr-index: Cleanup bit defines

[mirror_ubuntu-bionic-kernel.git] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index 9c4bdddd80c2123ac522c7d6c08453cca6c8445f..16fe2f99ab2553b3973a8d382f53ea7279b1f86e 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -649,6 +649,7 @@ config DEFERRED_STRUCT_PAGE_INIT
        depends on ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT
        depends on NO_BOOTMEM && MEMORY_HOTPLUG
        depends on !FLATMEM
+       depends on !NEED_PER_CPU_KM
        help
          Ordinarily all struct pages are initialised during early boot in a
          single thread. On very large machines this can take a considerable
@@ -756,3 +757,12 @@ config PERCPU_STATS
          This feature collects and exposes statistics via debugfs. The
          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_fast() benchmarking"
+       default n
+       help
+         Provides /sys/kernel/debug/gup_benchmark that helps with testing
+         performance of get_user_pages_fast().
+
+         See tools/testing/selftests/vm/gup_benchmark.c