Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753705AbaKCS14 (ORCPT ); Mon, 3 Nov 2014 13:27:56 -0500 Received: from gum.cmpxchg.org ([85.214.110.215]:58187 "EHLO gum.cmpxchg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753648AbaKCS1w (ORCPT ); Mon, 3 Nov 2014 13:27:52 -0500 Date: Mon, 3 Nov 2014 13:27:40 -0500 From: Johannes Weiner To: Andrew Morton Cc: Michal Hocko , Vladimir Davydov , Tejun Heo , David Miller , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [patch] mm: move page->mem_cgroup bad page handling into generic code fix Message-ID: <20141103182740.GA10816@phnom.home.cmpxchg.org> References: <1414898156-4741-1-git-send-email-hannes@cmpxchg.org> <1414898156-4741-3-git-send-email-hannes@cmpxchg.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1414898156-4741-3-git-send-email-hannes@cmpxchg.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove unneeded !CONFIG_MEMCG memcg bad_page() dummies as well. Signed-off-by: Johannes Weiner --- include/linux/memcontrol.h | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index e789551d4db0..41ae72b02b55 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -342,19 +342,6 @@ void mem_cgroup_count_vm_event(struct mm_struct *mm, enum vm_event_item idx) } #endif /* CONFIG_MEMCG */ -#if !defined(CONFIG_MEMCG) || !defined(CONFIG_DEBUG_VM) -static inline bool -mem_cgroup_bad_page_check(struct page *page) -{ - return false; -} - -static inline void -mem_cgroup_print_bad_page(struct page *page) -{ -} -#endif - enum { UNDER_LIMIT, SOFT_LIMIT, -- 2.1.3 -- 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/