diff options
author | Kyle McMartin <kyle@parisc-linux.org> | 2005-10-28 12:18:07 -0400 |
---|---|---|
committer | Kyle McMartin <kyle@parisc-linux.org> | 2005-10-28 12:18:07 -0400 |
commit | 210cc679faf0e1cabda9fc5d1279644f5e52aecb (patch) | |
tree | f0816c90ae937a159f8bfec6018a6271223b954a /arch/ppc/mm/pgtable.c | |
parent | e0f998930eb67c49f2862c58a45262ad0bc03eca (diff) | |
parent | 260b23674fdb570f3235ce55892246bef1c24c2a (diff) |
Auto-update from upstream
Diffstat (limited to 'arch/ppc/mm/pgtable.c')
-rw-r--r-- | arch/ppc/mm/pgtable.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/mm/pgtable.c b/arch/ppc/mm/pgtable.c index 81a3d7446d37..43505b1fc5d8 100644 --- a/arch/ppc/mm/pgtable.c +++ b/arch/ppc/mm/pgtable.c | |||
@@ -114,9 +114,9 @@ struct page *pte_alloc_one(struct mm_struct *mm, unsigned long address) | |||
114 | struct page *ptepage; | 114 | struct page *ptepage; |
115 | 115 | ||
116 | #ifdef CONFIG_HIGHPTE | 116 | #ifdef CONFIG_HIGHPTE |
117 | int flags = GFP_KERNEL | __GFP_HIGHMEM | __GFP_REPEAT; | 117 | gfp_t flags = GFP_KERNEL | __GFP_HIGHMEM | __GFP_REPEAT; |
118 | #else | 118 | #else |
119 | int flags = GFP_KERNEL | __GFP_REPEAT; | 119 | gfp_t flags = GFP_KERNEL | __GFP_REPEAT; |
120 | #endif | 120 | #endif |
121 | 121 | ||
122 | ptepage = alloc_pages(flags, 0); | 122 | ptepage = alloc_pages(flags, 0); |