diff options
| author | Al Viro | 2005-10-21 09:18:50 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2005-10-28 17:16:47 +0200 |
| commit | 6daa0e28627abf362138244a620a821a9027d816 (patch) | |
| tree | 5ca9cbc421cc1adf228cdd30cd627bca8be6242c /mm/shmem.c | |
| parent | [PATCH] gfp_t: infrastructure (diff) | |
| download | kernel-qcow2-linux-6daa0e28627abf362138244a620a821a9027d816.tar.gz kernel-qcow2-linux-6daa0e28627abf362138244a620a821a9027d816.tar.xz kernel-qcow2-linux-6daa0e28627abf362138244a620a821a9027d816.zip | |
[PATCH] gfp_t: mm/* (easy parts)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm/shmem.c')
| -rw-r--r-- | mm/shmem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index ea064d89cda9..55e04a0734c1 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -85,7 +85,7 @@ enum sgp_type { static int shmem_getpage(struct inode *inode, unsigned long idx, struct page **pagep, enum sgp_type sgp, int *type); -static inline struct page *shmem_dir_alloc(unsigned int gfp_mask) +static inline struct page *shmem_dir_alloc(gfp_t gfp_mask) { /* * The above definition of ENTRIES_PER_PAGE, and the use of @@ -898,7 +898,7 @@ struct page *shmem_swapin(struct shmem_inode_info *info, swp_entry_t entry, } static struct page * -shmem_alloc_page(unsigned long gfp, struct shmem_inode_info *info, +shmem_alloc_page(gfp_t gfp, struct shmem_inode_info *info, unsigned long idx) { struct vm_area_struct pvma; |