lkml.org 
[lkml]   [2020]   [Dec]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    SubjectRe: [PATCH 3/6] mm/gup: make __gup_longterm_locked common
    From
    Date
    On 12/1/20 9:23 PM, Pavel Tatashin wrote:
    > __gup_longterm_locked() has CMA || FS_DAX version and a common stub
    > version. In the preparation of prohibiting longterm pinning of pages from
    > movable zone make the CMA || FS_DAX version common, and delete the stub
    > version.
    >
    > Signed-off-by: Pavel Tatashin <pasha.tatashin@soleen.com>
    > ---
    > mm/gup.c | 13 -------------
    > 1 file changed, 13 deletions(-)
    >
    > diff --git a/mm/gup.c b/mm/gup.c
    > index 3a76c005a3e2..0e2de888a8b0 100644
    > --- a/mm/gup.c
    > +++ b/mm/gup.c
    > @@ -1567,7 +1567,6 @@ struct page *get_dump_page(unsigned long addr)
    > }
    > #endif /* CONFIG_ELF_CORE */
    >
    > -#if defined(CONFIG_FS_DAX) || defined (CONFIG_CMA)
    > #ifdef CONFIG_FS_DAX
    > static bool check_dax_vmas(struct vm_area_struct **vmas, long nr_pages)
    > {
    > @@ -1757,18 +1756,6 @@ static long __gup_longterm_locked(struct mm_struct *mm,
    > kfree(vmas_tmp);
    > return rc;
    > }
    > -#else /* !CONFIG_FS_DAX && !CONFIG_CMA */
    > -static __always_inline long __gup_longterm_locked(struct mm_struct *mm,
    > - unsigned long start,
    > - unsigned long nr_pages,
    > - struct page **pages,
    > - struct vm_area_struct **vmas,
    > - unsigned int flags)
    > -{
    > - return __get_user_pages_locked(mm, start, nr_pages, pages, vmas,
    > - NULL, flags);
    > -}
    > -#endif /* CONFIG_FS_DAX || CONFIG_CMA */
    >
    > static bool is_valid_gup_flags(unsigned int gup_flags)
    > {
    >

    At last some simplification here, yea!

    Reviewed-by: John Hubbard <jhubbard@nvidia.com>

    thanks,
    --
    John Hubbard
    NVIDIA

    \
     
     \ /
      Last update: 2020-12-03 09:04    [W:3.111 / U:0.520 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site