aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc/mm/pgtable.c
diff options
context:
space:
mode:
authorKyle McMartin <kyle@parisc-linux.org>2005-10-28 12:18:07 -0400
committerKyle McMartin <kyle@parisc-linux.org>2005-10-28 12:18:07 -0400
commit210cc679faf0e1cabda9fc5d1279644f5e52aecb (patch)
treef0816c90ae937a159f8bfec6018a6271223b954a /arch/ppc/mm/pgtable.c
parente0f998930eb67c49f2862c58a45262ad0bc03eca (diff)
parent260b23674fdb570f3235ce55892246bef1c24c2a (diff)
downloadkernel_samsung_smdk4412-210cc679faf0e1cabda9fc5d1279644f5e52aecb.tar.gz
kernel_samsung_smdk4412-210cc679faf0e1cabda9fc5d1279644f5e52aecb.tar.bz2
kernel_samsung_smdk4412-210cc679faf0e1cabda9fc5d1279644f5e52aecb.zip
Auto-update from upstream
Diffstat (limited to 'arch/ppc/mm/pgtable.c')
-rw-r--r--arch/ppc/mm/pgtable.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/mm/pgtable.c b/arch/ppc/mm/pgtable.c
index 81a3d7446d3..43505b1fc5d 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)
struct page *ptepage;
#ifdef CONFIG_HIGHPTE
- int flags = GFP_KERNEL | __GFP_HIGHMEM | __GFP_REPEAT;
+ gfp_t flags = GFP_KERNEL | __GFP_HIGHMEM | __GFP_REPEAT;
#else
- int flags = GFP_KERNEL | __GFP_REPEAT;
+ gfp_t flags = GFP_KERNEL | __GFP_REPEAT;
#endif
ptepage = alloc_pages(flags, 0);