diff --git a/[refs] b/[refs] index 57c2df5ed4ce..0f5c349f23c7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e6cbea39aaa32480145915751119227f29f6f7b +refs/heads/master: ab33dc09a5c0d2bd6757afa1c2f804c9657daec0 diff --git a/trunk/mm/swap.c b/trunk/mm/swap.c index dd89234ee51f..7417a2adbe50 100644 --- a/trunk/mm/swap.c +++ b/trunk/mm/swap.c @@ -278,9 +278,10 @@ int lru_add_drain_all(void) * Avoid taking zone->lru_lock if possible, but if it is taken, retain it * for the remainder of the operation. * - * The locking in this function is against shrink_cache(): we recheck the - * page count inside the lock to see whether shrink_cache grabbed the page - * via the LRU. If it did, give up: shrink_cache will free it. + * The locking in this function is against shrink_inactive_list(): we recheck + * the page count inside the lock to see whether shrink_inactive_list() + * grabbed the page via the LRU. If it did, give up: shrink_inactive_list() + * will free it. */ void release_pages(struct page **pages, int nr, int cold) {