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=-14.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham 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 2C081C3F68F for ; Fri, 14 Feb 2020 21:00:45 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id DA331222C2 for ; Fri, 14 Feb 2020 21:00:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="K7T9OJLg" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DA331222C2 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 801186B0693; Fri, 14 Feb 2020 16:00:44 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7B12B6B0695; Fri, 14 Feb 2020 16:00:44 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6C7BA6B0696; Fri, 14 Feb 2020 16:00:44 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0086.hostedemail.com [216.40.44.86]) by kanga.kvack.org (Postfix) with ESMTP id 572AA6B0693 for ; Fri, 14 Feb 2020 16:00:44 -0500 (EST) Received: from smtpin23.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id EFDDC824556B for ; Fri, 14 Feb 2020 21:00:43 +0000 (UTC) X-FDA: 76489951608.23.watch37_64a829f22d20 X-HE-Tag: watch37_64a829f22d20 X-Filterd-Recvd-Size: 4498 Received: from mail-ot1-f65.google.com (mail-ot1-f65.google.com [209.85.210.65]) by imf24.hostedemail.com (Postfix) with ESMTP for ; Fri, 14 Feb 2020 21:00:43 +0000 (UTC) Received: by mail-ot1-f65.google.com with SMTP id r16so10484987otd.2 for ; Fri, 14 Feb 2020 13:00:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=7DMurB2EcIliipQAm/Fyz3iYQa8JFCY3mjh5m99SUJQ=; b=K7T9OJLg4Rd6RuoeGZfJRBGbV7nSZMbJ5Vfkg9phnHv4jBT/9bBmEuX7Ysbb7zSCfq 2s+cMkr/gk9UaS2jQgaY4MoqrLuxyZxKIBNhGOf2D64qdFVNqOKzpV14sAYT0iHNnM4l lyzdxLTmt1uf3N/8m89DK6/febbiFEDywSo/UGz5XRmKsA8ecZHAr6YVgqG/2c8L9Ie2 lmVDfCT4+tNZ14mSY+CSv1w+C5mhumA18t6gnUWBqmdmA91FK6d6fbiUWXJCtFdm0RNG YnUxig7JD1deO+/D/aY8AFrxQmrDEkq5L6qeijk4AHlMztzl8h84OP5LzX5rK/NmK5f/ fqOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=7DMurB2EcIliipQAm/Fyz3iYQa8JFCY3mjh5m99SUJQ=; b=GLbrjv/5JvmYeywu3hNJpn1TKJ2uaBhYuBeBZ379dUltyeckrIs28HfJxBYD6VTpwW yKOfIfAMfeYfQ/ist4VZuroRKo31BKU07AoME9WhJhSpg0aqG2W2/GrxgnCSooBE/k3U etKngaq1Ri1AF3e+oAri+f3o2JkdKb6K2O9b1hmpq/8v+jmb98ZSUWqwjtufrSG6W8p1 txjg2WM4cuazItT3CjWxT+vWF1lnNfE1Mol9lN6l1nH5hbrwJ+1u5bMBkfgNJZl/POHl 3ygjb6Zt7DBW9g3lNy3/t947Ofm2jXP+l7RM/GUs1J8SypuP6+zPATxSDorNb9WoMjJ3 QHGw== X-Gm-Message-State: APjAAAUDEZf+61v+GXOvi0O8ri3FDJO7Aa2Qx+U7beXyWTaxZjgzi7JE qeL46nf979CakQvqKo3U+se8Zh/Ups/HeJcHXbDsFhZd9zU= X-Google-Smtp-Source: APXvYqwVLssaKbrmX/2dVzzlIfrCtRMpETQMFACNwFjNeW45I2jNMr2nyglMTtsq4MTz7pBu11KLlg1FFHUUKP9tKjM= X-Received: by 2002:a9d:2028:: with SMTP id n37mr3941956ota.127.1581714042131; Fri, 14 Feb 2020 13:00:42 -0800 (PST) MIME-Version: 1.0 References: <7ff9e944-1c6c-f7c1-d812-e12817c7a317@oracle.com> <20200214204544.231482-1-almasrymina@google.com> In-Reply-To: <20200214204544.231482-1-almasrymina@google.com> From: Mina Almasry Date: Fri, 14 Feb 2020 13:00:31 -0800 Message-ID: Subject: Re: [PATCH] hugetlb: fix CONFIG_CGROUP_HUGETLB ifdefs To: linux-mm@kvack.org, linux-next@vger.kernel.org, open list Cc: David Rientjes , Greg Thelen , Mike Kravetz , Shakeel Butt , Andrew Morton Content-Type: text/plain; charset="UTF-8" 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: On Fri, Feb 14, 2020 at 12:46 PM Mina Almasry wrote: > > Fixes an #ifdef bug in the patch referred to below that was > causing a build error when CONFIG_DEBUG_VM && > !CONFIG_CCGROUP_HUGETLB. > > Fixes: b5f16a533ce8a ("hugetlb: support file_region coalescing again") > Signed-off-by: Mina Almasry > Cc: David Rientjes > Cc: Greg Thelen > Cc: Mike Kravetz > Cc: Shakeel Butt > Cc: Andrew Morton > --- > mm/hugetlb.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index ee6d262fe6ac0..95d34c58981d2 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -289,7 +289,7 @@ static bool has_same_uncharge_info(struct file_region *rg, > #endif > } > > -#ifdef CONFIG_DEBUG_VM > +#if defined(CONFIG_DEBUG_VM) && defined(CONFIG_CGROUP_HUGETLB) > static void dump_resv_map(struct resv_map *resv) > { > struct list_head *head = &resv->regions; > @@ -325,6 +325,10 @@ static void check_coalesce_bug(struct resv_map *resv) > } > } > } > +#else > +static void check_coalesce_bug(struct resv_map *resv) > +{ > +} > #endif > > static void coalesce_file_region(struct resv_map *resv, struct file_region *rg) > @@ -431,9 +435,7 @@ static long add_reservation_in_range(struct resv_map *resv, long f, long t, > } > > VM_BUG_ON(add < 0); > -#ifdef CONFIG_DEBUG_VM > check_coalesce_bug(resv); > -#endif > return add; > } > > -- > 2.25.0.265.gbab2e86ba0-goog