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

/usr/src/devel/arch/x86/mm/gup.c: In function 'gup_pte_range':
/usr/src/devel/arch/x86/mm/gup.c:84: error: implicit declaration of function 'kunmap_atomic'
/usr/src/devel/arch/x86/mm/gup.c: In function 'get_user_pages_fast':
/usr/src/devel/arch/x86/mm/gup.c:230: warning: unused variable 'i'

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/mm/gup.c |    2 ++
 1 file changed, 2 insertions(+)

diff -puN arch/x86/mm/gup.c~x86-lockless-get_user_pages_fast-fix arch/x86/mm/gup.c
--- a/arch/x86/mm/gup.c~x86-lockless-get_user_pages_fast-fix
+++ a/arch/x86/mm/gup.c
@@ -7,6 +7,8 @@
 #include <linux/sched.h>
 #include <linux/mm.h>
 #include <linux/vmstat.h>
+#include <linux/highmem.h>
+
 #include <asm/pgtable.h>
 
 static inline pte_t gup_get_pte(pte_t *ptep)
_