From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 01CA5C83003 for ; Wed, 29 Apr 2020 09:37:35 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B26DA20731 for ; Wed, 29 Apr 2020 09:37:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chrisdown.name header.i=@chrisdown.name header.b="cbRvmJlk" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B26DA20731 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chrisdown.name Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 4471D8E0005; Wed, 29 Apr 2020 05:37:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3F5FD8E0001; Wed, 29 Apr 2020 05:37:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2E5038E0005; Wed, 29 Apr 2020 05:37:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0071.hostedemail.com [216.40.44.71]) by kanga.kvack.org (Postfix) with ESMTP id 12DCD8E0001 for ; Wed, 29 Apr 2020 05:37:34 -0400 (EDT) Received: from smtpin04.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id C1EB6181AEF00 for ; Wed, 29 Apr 2020 09:37:33 +0000 (UTC) X-FDA: 76760389986.04.cover68_7c94eaf1730d X-HE-Tag: cover68_7c94eaf1730d X-Filterd-Recvd-Size: 3914 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by imf18.hostedemail.com (Postfix) with ESMTP for ; Wed, 29 Apr 2020 09:37:33 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id d15so1683852wrx.3 for ; Wed, 29 Apr 2020 02:37:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chrisdown.name; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=pNZ16iQevjQ/8IQAHZuG35lWQY4XA4nVtj+uX2CMHUo=; b=cbRvmJlk0mGvEM+b7cGTQY6snfjh57hUORVrc/iu0us3uLLaTW6hbFf1wa492am7E7 Z+pPin265gIwXp0+0Bt9esUsHrzWv94Sy9gUYSvDG3uZyKZNUFn9LUp7Q9ocxvINP7WA BPaWBGu26Ptu5rMACBSGN22YUIiu+/zErJYF0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=pNZ16iQevjQ/8IQAHZuG35lWQY4XA4nVtj+uX2CMHUo=; b=Jam3srNQq0BUZUayg4zUjYMJYdfB31LM+VDNKjpLGH5V/+n3JmUusDTWTpJfICOLAM asywXy3GzWXNw5MWI8jDDJREUEGwkULldKKh5f4RXW0S+0t0hTethQcDIA4GQvU7Fyj6 olAazf4HzsWyDCqqBBuaWHS99JGqRMzElancVlMiL+cwUMWVOJXOkFQilo5KjYJhY50P fFHiuzXu2OWCN7IYWt0oHzFe4Gg+n02shMqY3SxP8qyLu5F/re1BWA9iKvlAypsMh7BY krIx865LxHAKmH5G1Gdpp8684PY27XhDD36Vygz0vVWy5HRbTy2tBO+LMRV1fe6j31g+ H7aQ== X-Gm-Message-State: AGi0PuZg2kAJmj4a+blkOBep2NOzekYr4UmJp1vMv1xUxoWYKqhM7lDW qWYva4ZHwYLxqzXD9/NprcCZYH1SXJ9JMg== X-Google-Smtp-Source: APiQypIyorf7Q57mZWmnYu34eD05l9UE9a0+E69oWdWBQbSW9+hN7+Etjvu+SlCX1VEuzXl9JyIqmQ== X-Received: by 2002:adf:f343:: with SMTP id e3mr36973863wrp.51.1588153052130; Wed, 29 Apr 2020 02:37:32 -0700 (PDT) Received: from localhost ([2a01:4b00:8432:8a00:56e1:adff:fe3f:49ed]) by smtp.gmail.com with ESMTPSA id q143sm7328511wme.31.2020.04.29.02.37.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Apr 2020 02:37:31 -0700 (PDT) Date: Wed, 29 Apr 2020 10:37:31 +0100 From: Chris Down To: Andrew Morton Cc: kbuild-all@lists.01.org, Johannes Weiner , Andrew Morton , Linux Memory Management List , kbuild test robot Subject: Re: [hnaz-linux-mm:master 80/408] include/linux/memcontrol.h:863:9: warning: 'return' with a value, in function returning void Message-ID: <20200429093731.GA2386944@chrisdown.name> References: <202004291630.FQPgxZlG%lkp@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <202004291630.FQPgxZlG%lkp@intel.com> 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: Huh, somehow the !CONFIG_MEMCG case got mangled in the final version sent upstream... Andrew, can you please apply this fixup to mm-memcg-decouple-elowmin-state-mutations-from-protection-checks.patch? Thank you! :-) diff --git include/linux/memcontrol.h include/linux/memcontrol.h index 200693484afe..277c8a6a1c38 100644 --- include/linux/memcontrol.h +++ include/linux/memcontrol.h @@ -847,18 +847,13 @@ static inline void memcg_memory_event_mm(struct mm_struct *mm, { } -static inline unsigned long mem_cgroup_protection(struct mem_cgroup *memcg, - bool in_low_reclaim) -{ - - static inline void mem_cgroup_calculate_protection(struct mem_cgroup *root, - struct mem_cgroup *memcg); + struct mem_cgroup *memcg) { } -static inline void mem_cgroup_protection(struct mem_cgroup *memcg, - bool in_low_reclaim) +static inline unsigned long mem_cgroup_protection(struct mem_cgroup *memcg, + bool in_low_reclaim) { return 0; }