From patchwork Thu Jan 9 17:27:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Gushchin X-Patchwork-Id: 11326213 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C023C1395 for ; Thu, 9 Jan 2020 17:28:40 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8CB54206ED for ; Thu, 9 Jan 2020 17:28:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=fb.com header.i=@fb.com header.b="Xci64heN" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8CB54206ED Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=fb.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 9E6E58E0005; Thu, 9 Jan 2020 12:28:31 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 970F98E0018; Thu, 9 Jan 2020 12:28:31 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8378F8E0005; Thu, 9 Jan 2020 12:28:31 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0173.hostedemail.com [216.40.44.173]) by kanga.kvack.org (Postfix) with ESMTP id 613DC8E0018 for ; Thu, 9 Jan 2020 12:28:31 -0500 (EST) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with SMTP id BFB1082499A8 for ; Thu, 9 Jan 2020 17:28:30 +0000 (UTC) X-FDA: 76358779980.30.girls09_8472b0c7cad5f X-Spam-Summary: 2,0,0,5cc19425b253d0dc,d41d8cd98f00b204,prvs=82770afb69=guro@fb.com,::akpm@linux-foundation.org:mhocko@kernel.org:hannes@cmpxchg.org:shakeelb@google.com:vdavydov.dev@gmail.com:linux-kernel@vger.kernel.org:kernel-team@fb.com:guro@fb.com,RULES_HIT:41:355:379:541:800:960:968:973:988:989:1260:1261:1277:1313:1314:1345:1359:1437:1516:1518:1534:1539:1711:1714:1730:1747:1777:1792:2198:2199:2393:2559:2562:2731:3138:3139:3140:3141:3142:3350:3865:4321:5007:6261:6653:9592:10004:10400:11026:11658:11914:12043:12114:12297:12438:12555:12895:13069:13161:13229:13311:13357:14181:14394:14721:21080:21451:21627:21990:30054:30064:30079,0,RBL:67.231.145.42:@fb.com:.lbl8.mailshell.net-62.12.0.100 64.201.201.201,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:25,LUA_SUMMARY:none X-HE-Tag: girls09_8472b0c7cad5f X-Filterd-Recvd-Size: 3662 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by imf13.hostedemail.com (Postfix) with ESMTP for ; Thu, 9 Jan 2020 17:28:29 +0000 (UTC) Received: from pps.filterd (m0044010.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 009HQZv1015920 for ; Thu, 9 Jan 2020 09:28:29 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=facebook; bh=jnlgsDdtYVJveaI0G6Q7dmewjsI31Dp2x/oUOXsEp0g=; b=Xci64heNvHp7/gmXUk5+Uzkig0u46Vd6/Gt2x3k8ZiufYiQNyh5ma26pXDmYFZ0Kz4U/ a+LaLjJvE/v4beM/6k3M8Sd04UtXorYhpKAl+401BWfqP5MZvzILS+1IwiZRjfMSIx8u WJg98a9jPyEO/YRa9WZnKrudgBh1SCQs31c= Received: from mail.thefacebook.com (mailout.thefacebook.com [199.201.64.23]) by mx0a-00082601.pphosted.com with ESMTP id 2xdtwdbwdb-7 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Thu, 09 Jan 2020 09:28:29 -0800 Received: from intmgw002.06.prn3.facebook.com (2620:10d:c081:10::13) by mail.thefacebook.com (2620:10d:c081:35::126) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA) id 15.1.1713.5; Thu, 9 Jan 2020 09:28:20 -0800 Received: by devvm2643.prn2.facebook.com (Postfix, from userid 111017) id 74D281D2DC5D6; Thu, 9 Jan 2020 09:28:18 -0800 (PST) Smtp-Origin-Hostprefix: devvm From: Roman Gushchin Smtp-Origin-Hostname: devvm2643.prn2.facebook.com To: , Andrew Morton CC: Michal Hocko , Johannes Weiner , Shakeel Butt , Vladimir Davydov , , , Roman Gushchin Smtp-Origin-Cluster: prn2c23 Subject: [PATCH 1/7] mm: kmem: remove duplicate definitions of __memcg_kmem_(un)charge() Date: Thu, 9 Jan 2020 09:27:39 -0800 Message-ID: <20200109172745.285585-2-guro@fb.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200109172745.285585-1-guro@fb.com> References: <20200109172745.285585-1-guro@fb.com> X-FB-Internal: Safe MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138,18.0.572 definitions=2020-01-09_03:2020-01-09,2020-01-09 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 mlxscore=0 lowpriorityscore=0 spamscore=0 suspectscore=0 bulkscore=0 adultscore=0 impostorscore=0 clxscore=1015 malwarescore=0 priorityscore=1501 mlxlogscore=726 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-1910280000 definitions=main-2001090143 X-FB-Internal: deliver X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: For some reason these inline functions are defined twice. Remove the second identical copy. Signed-off-by: Roman Gushchin --- include/linux/memcontrol.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index a7a0a1a5c8d5..9745d172ba18 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -1438,15 +1438,6 @@ static inline void memcg_kmem_uncharge(struct page *page, int order) { } -static inline int __memcg_kmem_charge(struct page *page, gfp_t gfp, int order) -{ - return 0; -} - -static inline void __memcg_kmem_uncharge(struct page *page, int order) -{ -} - #define for_each_memcg_cache_index(_idx) \ for (; NULL; )