lkml.org 
[lkml]   [2019]   [Aug]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 09/10] mm: remove the unused MIGRATE_PFN_DEVICE flag
    Date
    No one ever checks this flag, and we could easily get that information
    from the page if needed.

    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Reviewed-by: Ralph Campbell <rcampbell@nvidia.com>
    ---
    drivers/gpu/drm/nouveau/nouveau_dmem.c | 3 +--
    include/linux/migrate.h | 1 -
    mm/migrate.c | 4 ++--
    3 files changed, 3 insertions(+), 5 deletions(-)

    diff --git a/drivers/gpu/drm/nouveau/nouveau_dmem.c b/drivers/gpu/drm/nouveau/nouveau_dmem.c
    index d96b987b9982..fa1439941596 100644
    --- a/drivers/gpu/drm/nouveau/nouveau_dmem.c
    +++ b/drivers/gpu/drm/nouveau/nouveau_dmem.c
    @@ -580,8 +580,7 @@ static unsigned long nouveau_dmem_migrate_copy_one(struct nouveau_drm *drm,
    *dma_addr))
    goto out_dma_unmap;

    - return migrate_pfn(page_to_pfn(dpage)) |
    - MIGRATE_PFN_LOCKED | MIGRATE_PFN_DEVICE;
    + return migrate_pfn(page_to_pfn(dpage)) | MIGRATE_PFN_LOCKED;

    out_dma_unmap:
    dma_unmap_page(dev, *dma_addr, PAGE_SIZE, DMA_BIDIRECTIONAL);
    diff --git a/include/linux/migrate.h b/include/linux/migrate.h
    index 1e67dcfd318f..72120061b7d4 100644
    --- a/include/linux/migrate.h
    +++ b/include/linux/migrate.h
    @@ -166,7 +166,6 @@ static inline int migrate_misplaced_transhuge_page(struct mm_struct *mm,
    #define MIGRATE_PFN_MIGRATE (1UL << 1)
    #define MIGRATE_PFN_LOCKED (1UL << 2)
    #define MIGRATE_PFN_WRITE (1UL << 3)
    -#define MIGRATE_PFN_DEVICE (1UL << 4)
    #define MIGRATE_PFN_SHIFT 6

    static inline struct page *migrate_pfn_to_page(unsigned long mpfn)
    diff --git a/mm/migrate.c b/mm/migrate.c
    index e2565374d330..33e063c28c1b 100644
    --- a/mm/migrate.c
    +++ b/mm/migrate.c
    @@ -2237,8 +2237,8 @@ static int migrate_vma_collect_pmd(pmd_t *pmdp,
    goto next;

    page = device_private_entry_to_page(entry);
    - mpfn = migrate_pfn(page_to_pfn(page))|
    - MIGRATE_PFN_DEVICE | MIGRATE_PFN_MIGRATE;
    + mpfn = migrate_pfn(page_to_pfn(page)) |
    + MIGRATE_PFN_MIGRATE;
    if (is_write_device_private_entry(entry))
    mpfn |= MIGRATE_PFN_WRITE;
    } else {
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-08-14 10:26    [W:5.007 / U:0.248 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site