diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-08-04 02:26:03 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-08-04 02:26:03 +0200 |
| commit | 412a4ac5e9cf7fdeb6af562c25547a9b9da7674f (patch) | |
| tree | a8ce13cbc9c47c99799e5e3e3ad26ba78274ee73 /fs/inode.c | |
| parent | powerpc/kexec: Fix orphaned offline CPUs across kexec (diff) | |
| parent | powerpc/5200/i2c: improve i2c bus error recovery (diff) | |
| download | linux-412a4ac5e9cf7fdeb6af562c25547a9b9da7674f.tar.xz linux-412a4ac5e9cf7fdeb6af562c25547a9b9da7674f.zip | |
Merge commit 'gcl/next' into next
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) { /* |