]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
[PATCH] uml: fix pte bit collision
authorMiklos Szeredi <mszeredi@suse.cz>
Thu, 29 Mar 2007 08:20:29 +0000 (01:20 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 29 Mar 2007 15:22:24 +0000 (08:22 -0700)
_PAGE_PROTNONE conflicts with the lowest bit of pgoff.  This causes all sorts
of weirdness when nonlinear mappings are used.

Took me a good half day to track this down.

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Acked-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
include/asm-um/pgtable-2level.h

index 6050e0eb257e0f2b81601b29fd4d049f7acd07e0..172a75fde51285c49803a3843dbe74d743c62a03 100644 (file)
@@ -45,12 +45,12 @@ static inline void pgd_mkuptodate(pgd_t pgd)        { }
        ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK))
 
 /*
        ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK))
 
 /*
- * Bits 0 through 3 are taken
+ * Bits 0 through 4 are taken
  */
  */
-#define PTE_FILE_MAX_BITS      28
+#define PTE_FILE_MAX_BITS      27
 
 
-#define pte_to_pgoff(pte) (pte_val(pte) >> 4)
+#define pte_to_pgoff(pte) (pte_val(pte) >> 5)
 
 
-#define pgoff_to_pte(off) ((pte_t) { ((off) << 4) + _PAGE_FILE })
+#define pgoff_to_pte(off) ((pte_t) { ((off) << 5) + _PAGE_FILE })
 
 #endif
 
 #endif