Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[firefly-linux-kernel-4.4.55.git] / include / asm-arm / pgtable-nommu.h

diff --git a/include/asm-arm/pgtable-nommu.h b/include/asm-arm/pgtable-nommu.h
index 0c8be19fd66bff98f1ec13ef7484bfde6722c4a0..386fcc10a9730da5fbd2372322a27b040625705e 100644 (file)
--- a/include/asm-arm/pgtable-nommu.h
+++ b/include/asm-arm/pgtable-nommu.h
@@ -16,7 +16,6 @@
 #include <linux/slab.h>
 #include <asm/processor.h>
 #include <asm/page.h>
-#include <asm/io.h>
 
 /*
  * Trivial page table functions.
@@ -74,7 +73,6 @@ static inline int pte_file(pte_t pte) { return 0; }
  * These would be in other places but having them here reduces the diffs.
  */
 extern unsigned int kobjsize(const void *objp);
-extern int is_in_rom(unsigned long);
 
 /*
  * No page table caches to initialise.
@@ -93,6 +91,8 @@ extern int is_in_rom(unsigned long);
 
 #define FIRST_USER_ADDRESS      (0)
 
+#include <asm-generic/pgtable.h>
+
 #else 
 
 /*
@@ -102,7 +102,8 @@ extern int is_in_rom(unsigned long);
 #define v4_tlb_fns     (0)
 #define v4wb_tlb_fns   (0)
 #define v4wbi_tlb_fns  (0)
-#define v6_tlb_fns     (0)
+#define v6wbi_tlb_fns  (0)
+#define v7wbi_tlb_fns  (0)
 
 #define v3_user_fns    (0)
 #define v4_user_fns    (0)