From: Andrew Morton <akpm@linux-foundation.org>

Cc: Andi Kleen <andi@firstfloor.org>
Cc: Andy Whitcroft <apw@shadowen.org>
Cc: Badari Pulavarty <pbadari@us.ibm.com>
Cc: Dave Kleikamp <shaggy@austin.ibm.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Nick Piggin <npiggin@suse.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Zach Brown <zach.brown@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/x86/Kconfig          |    1 +
 include/asm-x86/uaccess.h |    2 --
 mm/Kconfig                |    3 +++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff -puN arch/x86/Kconfig~x86-lockless-get_user_pages_fast-fix-2 arch/x86/Kconfig
--- a/arch/x86/Kconfig~x86-lockless-get_user_pages_fast-fix-2
+++ a/arch/x86/Kconfig
@@ -22,6 +22,7 @@ config X86
 	select HAVE_IDE
 	select HAVE_OPROFILE
 	select HAVE_IOREMAP_PROT
+	select HAVE_GET_USER_PAGES_FAST
 	select HAVE_KPROBES
 	select HAVE_KRETPROBES
 	select HAVE_DYNAMIC_FTRACE
diff -puN include/asm-x86/uaccess.h~x86-lockless-get_user_pages_fast-fix-2 include/asm-x86/uaccess.h
--- a/include/asm-x86/uaccess.h~x86-lockless-get_user_pages_fast-fix-2
+++ a/include/asm-x86/uaccess.h
@@ -4,5 +4,3 @@
 # include "uaccess_64.h"
 #endif
 
-#define __HAVE_ARCH_GET_USER_PAGES_FAST
-
diff -puN mm/Kconfig~x86-lockless-get_user_pages_fast-fix-2 mm/Kconfig
--- a/mm/Kconfig~x86-lockless-get_user_pages_fast-fix-2
+++ a/mm/Kconfig
@@ -77,6 +77,9 @@ config FLAT_NODE_MEM_MAP
 	def_bool y
 	depends on !SPARSEMEM
 
+config HAVE_GET_USER_PAGES_FAST
+	bool
+
 #
 # Both the NUMA code and DISCONTIGMEM use arrays of pg_data_t's
 # to represent different areas of memory.  This variable allows
_