Merge branch 'xen/xenbus' into upstream/xen

[pandora-kernel.git] / arch / arm / include / asm / pgtable-nommu.h

diff --git a/arch/arm/include/asm/pgtable-nommu.h b/arch/arm/include/asm/pgtable-nommu.h
index b011f2e..ffc0e85 100644 (file)
--- a/arch/arm/include/asm/pgtable-nommu.h
+++ b/arch/arm/include/asm/pgtable-nommu.h
@@ -67,6 +67,7 @@ static inline int pte_file(pte_t pte) { return 0; }
  */
 #define pgprot_noncached(prot) __pgprot(0)
 #define pgprot_writecombine(prot) __pgprot(0)
+#define pgprot_dmacoherent(prot) __pgprot(0)
 
 
 /*
@@ -86,8 +87,8 @@ extern unsigned int kobjsize(const void *objp);
  * All 32bit addresses are effectively valid for vmalloc...
  * Sort of meaningless for non-VM targets.
  */
-#define        VMALLOC_START   0
-#define        VMALLOC_END     0xffffffff
+#define        VMALLOC_START   0UL
+#define        VMALLOC_END     0xffffffffUL
 
 #define FIRST_USER_ADDRESS      (0)