diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-07-26 03:52:21 +0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-07-26 03:52:21 +0400 |
| commit | 5ffdcd94ea0171cf9a3ca63051c2246426103b5b (patch) | |
| tree | dfa1522796d5af649caf64ac6e2f1e69119e85d0 /fs/inode.c | |
| parent | cf40f082f8d3a98e28af02af20d00d2500eb6a65 (diff) | |
| parent | b37fa16e78d6f9790462b3181602a26b5af36260 (diff) | |
| download | linux-5ffdcd94ea0171cf9a3ca63051c2246426103b5b.tar.xz | |
Merge commit 'v2.6.35-rc6' into spi/test
Diffstat (limited to 'fs/inode.c')
| -rw-r--r-- | fs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/inode.c b/fs/inode.c index 2bee20ae3d65..722860b323a9 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -512,7 +512,7 @@ static void prune_icache(int nr_to_scan) * This function is passed the number of inodes to scan, and it returns the * total number of remaining possibly-reclaimable inodes. */ -static int shrink_icache_memory(int nr, gfp_t gfp_mask) +static int shrink_icache_memory(struct shrinker *shrink, int nr, gfp_t gfp_mask) { if (nr) { /* |