diff --git a/[refs] b/[refs] index b0c7cca876db..c7d7f14f9404 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fba478b1719c39ea67f15c6158ff4993933e9d18 +refs/heads/master: 845d34318f8acb0d92d18ccc72ef6db4c7baeaea diff --git a/trunk/include/linux/mm.h b/trunk/include/linux/mm.h index 8b007ad2d450..17518fe0b311 100644 --- a/trunk/include/linux/mm.h +++ b/trunk/include/linux/mm.h @@ -637,9 +637,9 @@ extern unsigned long do_mremap(unsigned long addr, * These functions are passed a count `nr_to_scan' and a gfpmask. They should * scan `nr_to_scan' objects, attempting to free them. * - * The callback must the number of objects which remain in the cache. + * The callback must return the number of objects which remain in the cache. * - * The callback will be passes nr_to_scan == 0 when the VM is querying the + * The callback will be passed nr_to_scan == 0 when the VM is querying the * cache size, so a fastpath for that case is appropriate. */ typedef int (*shrinker_t)(int nr_to_scan, unsigned int gfp_mask);