Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp231200pxu; Wed, 25 Nov 2020 01:26:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJwcQYx+fPeu43n+u/RTyAwWfU+9XDXIOtAYPdTTrcdHzjdEcBRrGZCbU7/37TWBMFQSkgd5 X-Received: by 2002:a50:f148:: with SMTP id z8mr2644715edl.386.1606296366855; Wed, 25 Nov 2020 01:26:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606296366; cv=none; d=google.com; s=arc-20160816; b=CUbXACf79+ZyiEieZh5lzNH124ZQ7hYtChU7NR7T/+pmkCnRGOD0apJY76Y6oYdy/n N9CC8gvQOx99Q25lh+6fsjJvV7zlmAPuUcph4s3SQBtc7HpSyEHh4e9Am6RgsQqfrc70 Iw+tgx4VYryZD06oIYSoS0ZvDhodmb70WezB1grM8mMW/z3+PpKOrNVlo2a6jDrlnY/R pwqUl935tOSmWOtTNHDR4YsPRmLmKVHE7GDutXVYIZ+a8p7RfVyz863Fyck+dS0YX1ED U+Nj+LuyIFkcgQn9MR0oMq724niHbl2dGBYDijAeN8JgS1Bro7x9LIqx9iyGcB2IZSH2 zvTg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=F7IZJPpVplJnb/oRgygieaqt10nGC7E982jw8wjr1Hc=; b=Jp8oMlyP44rwcD/7499a/wonx0DsBwjmvOEd12S5hWW5WExrBmDWtj/Uwv4gmAS0Jt qBMR/u9Dyefiv/A8QWutyCbpYNG6ykICzE1fgnPYvyZoKCWSF1spPT8Xsrwmlh0R/+zO mkHq0X8yN5QnmFYLpf3N5sqGgl7805SomaWSn7PBi9ae4KsFIIvoklmmNhJE9z9qw3Zz N/jrSSj3AFeUdq4ZD3hkn7yrjqW1hUFJVR3nALFQuBmW+4Qwx0+yxlNYrbGrKBVjmf9j tEGmtmfTZzwxmENvWhEcYE3UoBaETYd2K0pkqKcNIsEjzAc1qqBQxSggldMb5FeKYtud D02g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=CWV9++pM; 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=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f15si833249edc.153.2020.11.25.01.25.43; Wed, 25 Nov 2020 01:26:06 -0800 (PST) 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=CWV9++pM; 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=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728084AbgKYJWq (ORCPT + 99 others); Wed, 25 Nov 2020 04:22:46 -0500 Received: from mail.kernel.org ([198.145.29.99]:47046 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726620AbgKYJWp (ORCPT ); Wed, 25 Nov 2020 04:22:45 -0500 Received: from aquarius.haifa.ibm.com (nesher1.haifa.il.ibm.com [195.110.40.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4CA022151B; Wed, 25 Nov 2020 09:22:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1606296164; bh=gq/nxZiYj8wSo5fHYvxwQbeui4caUA+z/EhI20F60d0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CWV9++pMkArnugJhxwmKrk5d8nWqb8l7/Sng40aQfILXLSZM1ZHeln/R+cQFjXztr gGoUeW9CcZ6lJssFfkF0mjGzfJyVXJbw/PvVxBJu4l0wLisRFO3I9eSvetasYF/fuq kpv/jFqs6C9zAS30HRC88hWK/BGPtSj7O+R6CNWk= From: Mike Rapoport To: Andrew Morton Cc: Alexander Viro , Andy Lutomirski , Arnd Bergmann , Borislav Petkov , Catalin Marinas , Christopher Lameter , Dan Williams , Dave Hansen , David Hildenbrand , Elena Reshetova , "H. Peter Anvin" , Ingo Molnar , James Bottomley , "Kirill A. Shutemov" , Matthew Wilcox , Mark Rutland , Mike Rapoport , Mike Rapoport , Michael Kerrisk , Palmer Dabbelt , Paul Walmsley , Peter Zijlstra , Rick Edgecombe , Roman Gushchin , Shuah Khan , Thomas Gleixner , Tycho Andersen , Will Deacon , linux-api@vger.kernel.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-nvdimm@lists.01.org, linux-riscv@lists.infradead.org, x86@kernel.org Subject: [PATCH v12 02/10] mmap: make mlock_future_check() global Date: Wed, 25 Nov 2020 11:22:00 +0200 Message-Id: <20201125092208.12544-3-rppt@kernel.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201125092208.12544-1-rppt@kernel.org> References: <20201125092208.12544-1-rppt@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mike Rapoport It will be used by the upcoming secret memory implementation. Signed-off-by: Mike Rapoport --- mm/internal.h | 3 +++ mm/mmap.c | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index c43ccdddb0f6..ae146a260b14 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -348,6 +348,9 @@ static inline void munlock_vma_pages_all(struct vm_area_struct *vma) extern void mlock_vma_page(struct page *page); extern unsigned int munlock_vma_page(struct page *page); +extern int mlock_future_check(struct mm_struct *mm, unsigned long flags, + unsigned long len); + /* * Clear the page's PageMlocked(). This can be useful in a situation where * we want to unconditionally remove a page from the pagecache -- e.g., diff --git a/mm/mmap.c b/mm/mmap.c index 61f72b09d990..c481f088bd50 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1348,9 +1348,8 @@ static inline unsigned long round_hint_to_min(unsigned long hint) return hint; } -static inline int mlock_future_check(struct mm_struct *mm, - unsigned long flags, - unsigned long len) +int mlock_future_check(struct mm_struct *mm, unsigned long flags, + unsigned long len) { unsigned long locked, lock_limit; -- 2.28.0