projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
[powerpc.git]
/
include
/
asm-mips
/
pgtable.h
diff --git
a/include/asm-mips/pgtable.h
b/include/asm-mips/pgtable.h
index
2e2d70d
..
17a7703
100644
(file)
--- a/
include/asm-mips/pgtable.h
+++ b/
include/asm-mips/pgtable.h
@@
-103,7
+103,7
@@
static inline void set_pte(pte_t *ptep, pte_t pte)
}
}
}
}
}
}
-#define set_pte_at(mm,
addr,ptep,pteval) set_pte(ptep,
pteval)
+#define set_pte_at(mm,
addr, ptep, pteval) set_pte(ptep,
pteval)
static inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
{
static inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
{
@@
-140,7
+140,7
@@
static inline void set_pte(pte_t *ptep, pte_t pteval)
}
#endif
}
}
#endif
}
-#define set_pte_at(mm,
addr,ptep,pteval) set_pte(ptep,
pteval)
+#define set_pte_at(mm,
addr, ptep, pteval) set_pte(ptep,
pteval)
static inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
{
static inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
{
@@
-168,11
+168,15
@@
static inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *pt
#define set_pud(pudptr, pudval) do { *(pudptr) = (pudval); } while(0)
#endif
#define set_pud(pudptr, pudval) do { *(pudptr) = (pudval); } while(0)
#endif
-#define PGD_T_LOG2
ffz(~sizeof(pgd_t)
)
-#define PMD_T_LOG2
ffz(~sizeof(pmd_t)
)
-#define PTE_T_LOG2
ffz(~sizeof(pte_t)
)
+#define PGD_T_LOG2
(__builtin_ffs(sizeof(pgd_t)) - 1
)
+#define PMD_T_LOG2
(__builtin_ffs(sizeof(pmd_t)) - 1
)
+#define PTE_T_LOG2
(__builtin_ffs(sizeof(pte_t)) - 1
)
-extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
+/*
+ * We used to declare this array with size but gcc 3.3 and older are not able
+ * to find that this expression is a constant, so the size is dropped.
+ */
+extern pgd_t swapper_pg_dir[];
/*
* The following only work if pte_present() is true.
/*
* The following only work if pte_present() is true.