Index: linux-stable/arch/x86/include/asm/highmem.h
===================================================================
--- linux-stable.orig/arch/x86/include/asm/highmem.h
+++ linux-stable/arch/x86/include/asm/highmem.h
@@ -69,7 +69,7 @@ void *kmap_atomic_pfn(unsigned long pfn)
 void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot);
 struct page *kmap_atomic_to_page(void *ptr);
 #else
-void *kmap_prot(struct page *page, pgprot_t prot);
+void *__kmap_prot(struct page *page, pgprot_t prot);
 # define kmap_atomic(page)			\
 	({ pagefault_disable(); kmap(page); })
 
@@ -80,10 +80,10 @@ void *kmap_prot(struct page *page, pgpro
 	do { kunmap(kmap_to_page(kvaddr)); pagefault_enable(); } while(0)
 
 # define kmap_atomic_prot(page, prot)		\
-	({ pagefault_disable(); kmap_prot(page, prot); })
+	({ pagefault_disable(); __kmap_prot(page, prot); })
 
 # define kmap_atomic_prot_pfn(pfn, prot)	\
-	({ pagefault_disable(); kmap_prot(pfn_to_page(pfn), prot); })
+	({ pagefault_disable(); __kmap_prot(pfn_to_page(pfn), prot); })
 
 # define kmap_atomic_to_page(kvaddr)		\
 	kmap_to_page(kvaddr)
Index: linux-stable/include/linux/highmem.h
===================================================================
--- linux-stable.orig/include/linux/highmem.h
+++ linux-stable/include/linux/highmem.h
@@ -59,7 +59,7 @@ static inline void *kmap(struct page *pa
 	return page_address(page);
 }
 
-#define kmap_prot(page, prot)	kmap(page)
+#define __kmap_prot(page, prot)	kmap(page)
 
 static inline void kunmap(struct page *page)
 {
Index: linux-stable/localversion-rt
===================================================================
--- linux-stable.orig/localversion-rt
+++ linux-stable/localversion-rt
@@ -1 +1 @@
--rt26
+-rt27
Index: linux-stable/include/linux/uprobes.h
===================================================================
--- linux-stable.orig/include/linux/uprobes.h
+++ linux-stable/include/linux/uprobes.h
@@ -26,6 +26,7 @@
 
 #include <linux/errno.h>
 #include <linux/rbtree.h>
+#include <linux/wait.h>
 
 struct vm_area_struct;
 struct mm_struct;
