jbd2: correctly unescape journal data blocks

[sfrench/cifs-2.6.git] / include / asm-um / fixmap.h

diff --git a/include/asm-um/fixmap.h b/include/asm-um/fixmap.h
index d352a35cfafb3c1a0aff2eeab1f630d8646f220a..9d2be52b865526586c93a79f1a14d4d7515b820c 100644 (file)
--- a/include/asm-um/fixmap.h
+++ b/include/asm-um/fixmap.h
@@ -1,9 +1,11 @@
 #ifndef __UM_FIXMAP_H
 #define __UM_FIXMAP_H
 
+#include <asm/processor.h>
+#include <asm/system.h>
 #include <asm/kmap_types.h>
 #include <asm/archparam.h>
-#include <asm/elf.h>
+#include <asm/page.h>
 
 /*
  * Here we define all the compile-time 'special' virtual
@@ -55,9 +57,8 @@ extern void __set_fixmap (enum fixed_addresses idx,
  * the start of the fixmap, and leave one page empty
  * at the top of mem..
  */
-extern unsigned long get_kmem_end(void);
 
-#define FIXADDR_TOP    (get_kmem_end() - 0x2000)
+#define FIXADDR_TOP    (TASK_SIZE - 2 * PAGE_SIZE)
 #define FIXADDR_SIZE   (__end_of_fixed_addresses << PAGE_SHIFT)
 #define FIXADDR_START  (FIXADDR_TOP - FIXADDR_SIZE)