Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752056AbaL2MLF (ORCPT ); Mon, 29 Dec 2014 07:11:05 -0500 Received: from mail-wi0-f174.google.com ([209.85.212.174]:52774 "EHLO mail-wi0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751464AbaL2MLB (ORCPT ); Mon, 29 Dec 2014 07:11:01 -0500 Date: Mon, 29 Dec 2014 13:10:57 +0100 From: Michal Hocko To: Vladimir Davydov Cc: Andrew Morton , Johannes Weiner , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH TRIVIAL] swap: remove unused mem_cgroup_uncharge_swapcache declaration Message-ID: <20141229121057.GB32618@dhcp22.suse.cz> References: <1419854337-15161-1-git-send-email-vdavydov@parallels.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1419854337-15161-1-git-send-email-vdavydov@parallels.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon 29-12-14 14:58:57, Vladimir Davydov wrote: > The body of this function was removed by commit 0a31bc97c80c ("mm: > memcontrol: rewrite uncharge API"). > > Signed-off-by: Vladimir Davydov Acked-by: Michal Hocko > --- > include/linux/swap.h | 15 --------------- > mm/shmem.c | 2 +- > 2 files changed, 1 insertion(+), 16 deletions(-) > > diff --git a/include/linux/swap.h b/include/linux/swap.h > index 34e8b60ab973..7067eca501e2 100644 > --- a/include/linux/swap.h > +++ b/include/linux/swap.h > @@ -437,16 +437,6 @@ extern int reuse_swap_page(struct page *); > extern int try_to_free_swap(struct page *); > struct backing_dev_info; > > -#ifdef CONFIG_MEMCG > -extern void > -mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent, bool swapout); > -#else > -static inline void > -mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent, bool swapout) > -{ > -} > -#endif > - > #else /* CONFIG_SWAP */ > > #define swap_address_space(entry) (NULL) > @@ -547,11 +537,6 @@ static inline swp_entry_t get_swap_page(void) > return entry; > } > > -static inline void > -mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent) > -{ > -} > - > #endif /* CONFIG_SWAP */ > #endif /* __KERNEL__*/ > #endif /* _LINUX_SWAP_H */ > diff --git a/mm/shmem.c b/mm/shmem.c > index 185836ba53ef..0c92e925c4bf 100644 > --- a/mm/shmem.c > +++ b/mm/shmem.c > @@ -1131,7 +1131,7 @@ repeat: > * truncated or holepunched since swap was confirmed. > * shmem_undo_range() will have done some of the > * unaccounting, now delete_from_swap_cache() will do > - * the rest (including mem_cgroup_uncharge_swapcache). > + * the rest. > * Reset swap.val? No, leave it so "failed" goes back to > * "repeat": reading a hole and writing should succeed. > */ > -- > 1.7.10.4 > -- Michal Hocko SUSE Labs -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/