diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-13 21:22:27 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-13 21:22:27 -0400 |
| commit | 59aee3c2a1e69fe5062bd1facb72d6fcea3f3f8f (patch) | |
| tree | b337d73229a69e399d4e4f7128b33ce734660e35 /mm/shmem.c | |
| parent | 0d69ae5fb7eb9ba3b54cf0ba4ef5ae591f31eef7 (diff) | |
| parent | 046d20b73960b7a2474b6d5e920d54c3fd7c23fe (diff) | |
Merge branch 'master'
Diffstat (limited to 'mm/shmem.c')
| -rw-r--r-- | mm/shmem.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index 1f7aeb210c7b..ea064d89cda9 100644 --- a/mm/shmem.c +++ b/mm/shmem.c | |||
| @@ -921,8 +921,7 @@ shmem_swapin(struct shmem_inode_info *info,swp_entry_t entry,unsigned long idx) | |||
| 921 | } | 921 | } |
| 922 | 922 | ||
| 923 | static inline struct page * | 923 | static inline struct page * |
| 924 | shmem_alloc_page(unsigned int __nocast gfp,struct shmem_inode_info *info, | 924 | shmem_alloc_page(gfp_t gfp,struct shmem_inode_info *info, unsigned long idx) |
| 925 | unsigned long idx) | ||
| 926 | { | 925 | { |
| 927 | return alloc_page(gfp | __GFP_ZERO); | 926 | return alloc_page(gfp | __GFP_ZERO); |
| 928 | } | 927 | } |