Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into...

[linux-2.6-omap-h63xx.git] / include / asm-frv / pgtable.h

diff --git a/include/asm-frv/pgtable.h b/include/asm-frv/pgtable.h
index 844666377dcbfc45db86c4b33d5c9ec431fb4907..7af7485e889eeb488960ae78d51627f2cd7d3c98 100644 (file)
--- a/include/asm-frv/pgtable.h
+++ b/include/asm-frv/pgtable.h
@@ -16,7 +16,6 @@
 #ifndef _ASM_PGTABLE_H
 #define _ASM_PGTABLE_H
 
-#include <linux/config.h>
 #include <asm/mem-layout.h>
 #include <asm/setup.h>
 #include <asm/processor.h>
@@ -420,6 +419,11 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr,
        asm volatile("dcf %M0" :: "U"(*ptep));
 }
 
+/*
+ * Macro to mark a page protection value as "uncacheable"
+ */
+#define pgprot_noncached(prot) (__pgprot(pgprot_val(prot) | _PAGE_NOCACHE))
+
 /*
  * Conversion functions: convert a page and protection to a page entry,
  * and a page entry and page directory to the page they refer to.