Missed a change to fixmap.h in the highmem update.

diff --git a/include/asm-um/fixmap.h b/include/asm-um/fixmap.h
index 6ae492a9e52e389cffd6fda2a189ddc87adef00e..0e8a4c1ace9c48d2edb7f02f5fbfd32010069eb4 100644 (file)
--- a/include/asm-um/fixmap.h
+++ b/include/asm-um/fixmap.h
@@ -61,6 +61,7 @@ extern unsigned long get_kmem_end(void);
 #define FIXADDR_START  (FIXADDR_TOP - FIXADDR_SIZE)
 
 #define __fix_to_virt(x)       (FIXADDR_TOP - ((x) << PAGE_SHIFT))
+#define __virt_to_fix(x)      ((FIXADDR_TOP - ((x)&PAGE_MASK)) >> PAGE_SHIFT)
 
 extern void __this_fixmap_does_not_exist(void);
 
@@ -86,4 +87,10 @@ static inline unsigned long fix_to_virt(const unsigned int idx)
         return __fix_to_virt(idx);
 }
 
+static inline unsigned long virt_to_fix(const unsigned long vaddr)
+{
+      BUG_ON(vaddr >= FIXADDR_TOP || vaddr < FIXADDR_START);
+      return __virt_to_fix(vaddr);
+}
+
 #endif