Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp352516pxx; Wed, 28 Oct 2020 06:31:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw0nZ6IaRZeMDJsMEsKrDmOxlgCayxnBTyCKgthbGgrYjuoy+BsB7t77gnK1qSpDMwpNBB+ X-Received: by 2002:a5d:4c4f:: with SMTP id n15mr8752465wrt.137.1603891916731; Wed, 28 Oct 2020 06:31:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603891916; cv=none; d=google.com; s=arc-20160816; b=ohg5/S/1UE0ThE1mkhjhx+6W0+p72uqheZu105zxYRiHzy4IR7XncjKVCiEhS0Rsra CpXECH98dgeuPdLC+vLOkjE3iv/KDWlfm66ZsBDmOPf5b81JKJ2MAyZc6UFmVqrd3N99 8cm17Yg7oQMIQ8drICnTdltZcEeBLTJ7XyX1Y3v8Dfv9MWp6AUsl1NwPLpR/NUbRtgjQ zESFe73yTfZWTwT2ntGuvtnByIwkewvJe0ve3Lq6DaE/SJQq+WUU2qmtMP5hsTvskhxb tS1chRuJD9Wux2mljvIEO7b0qcC77cMtx8Sx4pC1I8H7lN9RmcNYqZ1JiZ4PnDYR9Rnf QQyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=kk82wjyyRzHjW8co5Xj8M8Ae97drtQtYnTsGU0JB2G0=; b=YIYx0cz+wRFuZCNI7WcfhPTwBm4Cvhp5Lidj9F+256pvUC1LtqDxjP6oBhfHaucLTW vjlTsueH3Fxh3SF2ZLQs1lhi8CLiKBn0iDfJEV373kDbBOL25soEgjANRTFnPkjSs64d Ec33G0jMgJYsQMzNC8PMdDN7ExHvtFuxZu/zWRIVVqiOOeYR1Ql0KDw46nwcyUvnLRk7 Y7gg2NXeRHaHHvMj9U3pDU5LjEWSNVzvl5MN+JHgeSCKrwiPXrTZAWSkEc9dU/O7sYMY nSfz+Vyl/Xe3EJKQAQI7I6wgGLG6SVOz0bahudIgnrm6JqpUG64WNxKBLNfpxFYLpgFw YNPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=IDZq7ng6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i19si2816688ejh.153.2020.10.28.06.31.33; Wed, 28 Oct 2020 06:31:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=IDZq7ng6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1802128AbgJ0Ppn (ORCPT + 99 others); Tue, 27 Oct 2020 11:45:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:54804 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1800523AbgJ0PgH (ORCPT ); Tue, 27 Oct 2020 11:36:07 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4AD512225E; Tue, 27 Oct 2020 15:36:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603812965; bh=4m0G9Rxk7uOd0oxncto8sVRYvtKm8kMXhZrGfmFjMqI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IDZq7ng6yac8UqHBYHDAyJ9qegL0l5UoqB/m8W3lV3IgcYFgPYJfYTRVMIps0YN2U sgJaAd1OF9P7TjRVGAuTfrffw7oHgOvwe9Xr8D+m2gXfy4ggw3XPd5qPEHUFTylfaQ FCaUKzeW3jJfJCRMKyTJIzqDDnn8g+Px3fAl7BXU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Liao Pingfang , Yi Wang , Andrew Morton , Linus Torvalds , Sasha Levin Subject: [PATCH 5.9 392/757] mm/mmap.c: replace do_brk with do_brk_flags in comment of insert_vm_struct() Date: Tue, 27 Oct 2020 14:50:42 +0100 Message-Id: <20201027135508.942656738@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135450.497324313@linuxfoundation.org> References: <20201027135450.497324313@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Liao Pingfang [ Upstream commit 8332326e8e47fbc35711433419c31f610153dd58 ] Replace do_brk with do_brk_flags in comment of insert_vm_struct(), since do_brk was removed in following commit. Fixes: bb177a732c4369 ("mm: do not bug_on on incorrect length in __mm_populate()") Signed-off-by: Liao Pingfang Signed-off-by: Yi Wang Signed-off-by: Andrew Morton Link: https://lkml.kernel.org/r/1600650778-43230-1-git-send-email-wang.yi59@zte.com.cn Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- mm/mmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/mmap.c b/mm/mmap.c index bdd19f5b994e0..7a8987aa69962 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -3227,7 +3227,7 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma) * By setting it to reflect the virtual start address of the * vma, merges and splits can happen in a seamless way, just * using the existing file pgoff checks and manipulations. - * Similarly in do_mmap and in do_brk. + * Similarly in do_mmap and in do_brk_flags. */ if (vma_is_anonymous(vma)) { BUG_ON(vma->anon_vma); -- 2.25.1