diff options
author | Steve French <sfrench@us.ibm.com> | 2005-10-31 08:36:11 -0800 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2005-10-31 08:36:11 -0800 |
commit | 53b2ec5518aa2623e8c0cb36f1c304a797988a46 (patch) | |
tree | 465d8631ade6c2fcbd7576ff9813d00116c6a1e8 /fs/dcache.c | |
parent | 0753ca7bc2b876dd136e9db11a20f85cbe4e08b1 (diff) | |
parent | 581c1b14394aee60aff46ea67d05483261ed6527 (diff) |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'fs/dcache.c')
-rw-r--r-- | fs/dcache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/dcache.c b/fs/dcache.c index fb10386c59b..e90512ed35a 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -689,7 +689,7 @@ void shrink_dcache_anon(struct hlist_head *head) * * In this case we return -1 to tell the caller that we baled. */ -static int shrink_dcache_memory(int nr, unsigned int gfp_mask) +static int shrink_dcache_memory(int nr, gfp_t gfp_mask) { if (nr) { if (!(gfp_mask & __GFP_FS)) |