projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86/mm' into x86/boot, to pick up dependencies
[cascardo/linux.git]
/
arch
/
metag
/
include
/
asm
/
pgalloc.h
diff --git
a/arch/metag/include/asm/pgalloc.h
b/arch/metag/include/asm/pgalloc.h
index
3104df0
..
c2caa1e
100644
(file)
--- a/
arch/metag/include/asm/pgalloc.h
+++ b/
arch/metag/include/asm/pgalloc.h
@@
-42,8
+42,7
@@
static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
unsigned long address)
{
static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
unsigned long address)
{
- pte_t *pte = (pte_t *)__get_free_page(GFP_KERNEL | __GFP_REPEAT |
- __GFP_ZERO);
+ pte_t *pte = (pte_t *)__get_free_page(GFP_KERNEL | __GFP_ZERO);
return pte;
}
return pte;
}
@@
-51,7
+50,7
@@
static inline pgtable_t pte_alloc_one(struct mm_struct *mm,
unsigned long address)
{
struct page *pte;
unsigned long address)
{
struct page *pte;
- pte = alloc_pages(GFP_KERNEL
| __GFP_REPEAT
| __GFP_ZERO, 0);
+ pte = alloc_pages(GFP_KERNEL | __GFP_ZERO, 0);
if (!pte)
return NULL;
if (!pgtable_page_ctor(pte)) {
if (!pte)
return NULL;
if (!pgtable_page_ctor(pte)) {