--- v5
+++ v8
@@ -1,26 +1,26 @@
-Introduce CONFIG_SPF which turns on the Speculative Page Fault handler when
-building for 64bits with SMP.
+This configuration variable will be used to build the code needed to
+handle speculative page fault.
 
+By default it is turned off, and activated depending on architecture
+support.
+
+Suggested-by: Thomas Gleixner <tglx@linutronix.de>
 Signed-off-by: Laurent Dufour <ldufour@linux.vnet.ibm.com>
 ---
- arch/x86/Kconfig | 4 ++++
- 1 file changed, 4 insertions(+)
+ mm/Kconfig | 3 +++
+ 1 file changed, 3 insertions(+)
 
-diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index 063f1e0d51aa..a726618b7018 100644
---- a/arch/x86/Kconfig
-+++ b/arch/x86/Kconfig
-@@ -2865,6 +2865,10 @@ config X86_DMA_REMAP
- config HAVE_GENERIC_GUP
- 	def_bool y
+diff --git a/mm/Kconfig b/mm/Kconfig
+index c782e8fb7235..42be0d92336e 100644
+--- a/mm/Kconfig
++++ b/mm/Kconfig
+@@ -760,3 +760,6 @@ config GUP_BENCHMARK
+ 	  performance of get_user_pages_fast().
  
-+config SPF
-+	def_bool y
-+	depends on X86_64 && SMP
+ 	  See tools/testing/selftests/vm/gup_benchmark.c
 +
- source "net/Kconfig"
- 
- source "drivers/Kconfig"
++config SPECULATIVE_PAGE_FAULT
++       bool
 -- 
 2.7.4