Patched in Tegra support.

1 files changed, 25 insertions, 29 deletions

diff --git a/include/linux/highmem.h b/include/linux/highmem.h
index ef788b5b4a3..3a93f73a8ac 100644
--- a/include/linux/highmem.h
+++ b/include/linux/highmem.h
@@ -3,7 +3,6 @@
 
 #include <linux/fs.h>
 #include <linux/kernel.h>
-#include <linux/bug.h>
 #include <linux/mm.h>
 #include <linux/uaccess.h>
 #include <linux/hardirq.h>
@@ -39,17 +38,10 @@ extern unsigned long totalhigh_pages;
 
 void kmap_flush_unused(void);
 
-struct page *kmap_to_page(void *addr);
-
 #else /* CONFIG_HIGHMEM */
 
 static inline unsigned int nr_free_highpages(void) { return 0; }
 
-static inline struct page *kmap_to_page(void *addr)
-{
-        return virt_to_page(addr);
-}
-
 #define totalhigh_pages 0UL
 
 #ifndef ARCH_HAS_KMAP
@@ -63,12 +55,12 @@ static inline void kunmap(struct page *page)
 {
 }
 
-static inline void *kmap_atomic(struct page *page)
+static inline void *__kmap_atomic(struct page *page)
 {
         pagefault_disable();
         return page_address(page);
 }
-#define kmap_atomic_prot(page, prot)    kmap_atomic(page)
+#define kmap_atomic_prot(page, prot)    __kmap_atomic(page)
 
 static inline void __kunmap_atomic(void *addr)
 {
@@ -117,23 +109,27 @@ static inline void kmap_atomic_idx_pop(void)
 #endif
 
 /*
+ * Make both: kmap_atomic(page, idx) and kmap_atomic(page) work.
+ */
+#define kmap_atomic(page, args...) __kmap_atomic(page)
+
+/*
  * Prevent people trying to call kunmap_atomic() as if it were kunmap()
  * kunmap_atomic() should get the return value of kmap_atomic, not the page.
  */
-#define kunmap_atomic(addr)                                     \
-do {                                                            \
-        BUILD_BUG_ON(__same_type((addr), struct page *));       \
-        __kunmap_atomic(addr);                                  \
+#define kunmap_atomic(addr, args...)                            \
+do {                                                            \
+        BUILD_BUG_ON(__same_type((addr), struct page *));       \
+        __kunmap_atomic(addr);                                  \
 } while (0)
 
-
 /* when CONFIG_HIGHMEM is not set these will be plain clear/copy_page */
 #ifndef clear_user_highpage
 static inline void clear_user_highpage(struct page *page, unsigned long vaddr)
 {
-        void *addr = kmap_atomic(page);
+        void *addr = kmap_atomic(page, KM_USER0);
         clear_user_page(addr, vaddr, page);
-        kunmap_atomic(addr);
+        kunmap_atomic(addr, KM_USER0);
 }
 #endif
 
@@ -184,16 +180,16 @@ alloc_zeroed_user_highpage_movable(struct vm_area_struct *vma,
 
 static inline void clear_highpage(struct page *page)
 {
-        void *kaddr = kmap_atomic(page);
+        void *kaddr = kmap_atomic(page, KM_USER0);
         clear_page(kaddr);
-        kunmap_atomic(kaddr);
+        kunmap_atomic(kaddr, KM_USER0);
 }
 
 static inline void zero_user_segments(struct page *page,
         unsigned start1, unsigned end1,
         unsigned start2, unsigned end2)
 {
-        void *kaddr = kmap_atomic(page);
+        void *kaddr = kmap_atomic(page, KM_USER0);
 
         BUG_ON(end1 > PAGE_SIZE || end2 > PAGE_SIZE);
 
@@ -203,7 +199,7 @@ static inline void zero_user_segments(struct page *page,
         if (end2 > start2)
                 memset(kaddr + start2, 0, end2 - start2);
 
-        kunmap_atomic(kaddr);
+        kunmap_atomic(kaddr, KM_USER0);
         flush_dcache_page(page);
 }
 
@@ -232,11 +228,11 @@ static inline void copy_user_highpage(struct page *to, struct page *from,
 {
         char *vfrom, *vto;
 
-        vfrom = kmap_atomic(from);
-        vto = kmap_atomic(to);
+        vfrom = kmap_atomic(from, KM_USER0);
+        vto = kmap_atomic(to, KM_USER1);
         copy_user_page(vto, vfrom, vaddr, to);
-        kunmap_atomic(vto);
-        kunmap_atomic(vfrom);
+        kunmap_atomic(vto, KM_USER1);
+        kunmap_atomic(vfrom, KM_USER0);
 }
 
 #endif
@@ -245,11 +241,11 @@ static inline void copy_highpage(struct page *to, struct page *from)
 {
         char *vfrom, *vto;
 
-        vfrom = kmap_atomic(from);
-        vto = kmap_atomic(to);
+        vfrom = kmap_atomic(from, KM_USER0);
+        vto = kmap_atomic(to, KM_USER1);
         copy_page(vto, vfrom);
-        kunmap_atomic(vto);
-        kunmap_atomic(vfrom);
+        kunmap_atomic(vto, KM_USER1);
+        kunmap_atomic(vfrom, KM_USER0);
 }
 
 #endif /* _LINUX_HIGHMEM_H */