git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
include
/
asm-ia64
/
pgalloc.h
diff --git
a/include/asm-ia64/pgalloc.h
b/include/asm-ia64/pgalloc.h
index
9733168
..
fda0dba
100644
(file)
--- a/
include/asm-ia64/pgalloc.h
+++ b/
include/asm-ia64/pgalloc.h
@@
-61,9
+61,7
@@
pgd_alloc (struct mm_struct *mm)
pgd_t *pgd = pgd_alloc_one_fast(mm);
if (unlikely(pgd == NULL)) {
pgd_t *pgd = pgd_alloc_one_fast(mm);
if (unlikely(pgd == NULL)) {
- pgd = (pgd_t *)__get_free_page(GFP_KERNEL);
- if (likely(pgd != NULL))
- clear_page(pgd);
+ pgd = (pgd_t *)__get_free_page(GFP_KERNEL|__GFP_ZERO);
}
return pgd;
}
}
return pgd;
}
@@
-79,12
+77,11
@@
pgd_free (pgd_t *pgd)
}
static inline void
}
static inline void
-p
gd_populate (struct mm_struct *mm, pgd_t *pg
d_entry, pmd_t *pmd)
+p
ud_populate (struct mm_struct *mm, pud_t *pu
d_entry, pmd_t *pmd)
{
{
- p
gd_val(*pg
d_entry) = __pa(pmd);
+ p
ud_val(*pu
d_entry) = __pa(pmd);
}
}
-
static inline pmd_t*
pmd_alloc_one_fast (struct mm_struct *mm, unsigned long addr)
{
static inline pmd_t*
pmd_alloc_one_fast (struct mm_struct *mm, unsigned long addr)
{
@@
-107,10
+104,8
@@
pmd_alloc_one_fast (struct mm_struct *mm, unsigned long addr)
static inline pmd_t*
pmd_alloc_one (struct mm_struct *mm, unsigned long addr)
{
static inline pmd_t*
pmd_alloc_one (struct mm_struct *mm, unsigned long addr)
{
- pmd_t *pmd = (pmd_t *)__get_free_page(GFP_KERNEL|__GFP_REPEAT);
+ pmd_t *pmd = (pmd_t *)__get_free_page(GFP_KERNEL|__GFP_REPEAT
|__GFP_ZERO
);
- if (likely(pmd != NULL))
- clear_page(pmd);
return pmd;
}
return pmd;
}
@@
-141,20
+136,16
@@
pmd_populate_kernel (struct mm_struct *mm, pmd_t *pmd_entry, pte_t *pte)
static inline struct page *
pte_alloc_one (struct mm_struct *mm, unsigned long addr)
{
static inline struct page *
pte_alloc_one (struct mm_struct *mm, unsigned long addr)
{
- struct page *pte = alloc_pages(GFP_KERNEL|__GFP_REPEAT, 0);
+ struct page *pte = alloc_pages(GFP_KERNEL|__GFP_REPEAT
|__GFP_ZERO
, 0);
- if (likely(pte != NULL))
- clear_page(page_address(pte));
return pte;
}
static inline pte_t *
pte_alloc_one_kernel (struct mm_struct *mm, unsigned long addr)
{
return pte;
}
static inline pte_t *
pte_alloc_one_kernel (struct mm_struct *mm, unsigned long addr)
{
- pte_t *pte = (pte_t *)__get_free_page(GFP_KERNEL|__GFP_REPEAT);
+ pte_t *pte = (pte_t *)__get_free_page(GFP_KERNEL|__GFP_REPEAT
|__GFP_ZERO
);
- if (likely(pte != NULL))
- clear_page(pte);
return pte;
}
return pte;
}