mm/pat cleanup for v4.10
Subsystems (6)
Linus,
Please pull the latest mm-pat-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git mm-pat-for-linus
# HEAD: 308a047c3f6b61cc4007c0051fe420197ea58f86 x86/pat, mm: Make track_pfn_insert() return void
A single cleanup for a generic interface that was originally introduced for PAT.
Thanks,
Ingo
------------------>
Borislav Petkov (1):
x86/pat, mm: Make track_pfn_insert() return void
arch/x86/mm/pat.c | 7 ++----- include/asm-generic/pgtable.h | 9 ++++----- mm/huge_memory.c | 5 +++-- mm/memory.c | 8 ++++---- 4 files changed, 13 insertions(+), 16 deletions(-)
arch/x86/mm/pat.c +2 -5
@@ -986,20 +986,17 @@ int track_pfn_remap(struct vm_area_struct *vma, pgprot_t *prot,return 0 ; } -int track_pfn_insert (struct vm_area_struct *vma,pgprot_t *prot, -pfn_t pfn) +void track_pfn_insert (struct vm_area_struct *vma,pgprot_t *prot,pfn_t pfn) {enum page_cache_mode pcm;if (!pat_enabled ()) -return 0 ; +return ;/* Set prot based on lookup */ pcm =lookup_memtype (pfn_t_to_phys (pfn)); *prot =__pgprot ((pgprot_val (*prot) & (~_PAGE_CACHE_MASK)) |cachemode2protval (pcm)); - -return 0 ; }/*
include/asm-generic/pgtable.h +4 -5
@@ -558,10 +558,9 @@ static inline int track_pfn_remap(struct vm_area_struct *vma, pgprot_t *prot,* track_pfn_insert is called when a _new_ single pfn is established * by vm_insert_pfn(). */ -static inline int track_pfn_insert (struct vm_area_struct *vma,pgprot_t *prot, -pfn_t pfn) +static inline void track_pfn_insert (struct vm_area_struct *vma,pgprot_t *prot, +pfn_t pfn) { -return 0 ; }/*
@@ -593,8 +592,8 @@ static inline void untrack_pfn_moved(struct vm_area_struct *vma)extern int track_pfn_remap (struct vm_area_struct *vma,pgprot_t *prot,unsigned long pfn,unsigned long addr,unsigned long size); -extern int track_pfn_insert (struct vm_area_struct *vma,pgprot_t *prot, -pfn_t pfn); +extern void track_pfn_insert (struct vm_area_struct *vma,pgprot_t *prot, +pfn_t pfn);extern int track_pfn_copy (struct vm_area_struct *vma);extern void untrack_pfn (struct vm_area_struct *vma,unsigned long pfn,unsigned long size);
mm/huge_memory.c +3 -2
@@ -737,8 +737,9 @@ int vmf_insert_pfn_pmd(struct vm_area_struct *vma, unsigned long addr,if (addr < vma->vm_start || addr >= vma->vm_end)return VM_FAULT_SIGBUS ; -if (track_pfn_insert (vma, &pgprot, pfn)) -return VM_FAULT_SIGBUS ; + +track_pfn_insert (vma, &pgprot, pfn); +insert_pfn_pmd (vma, addr, pmd, pfn, pgprot, write);return VM_FAULT_NOPAGE ; }
mm/memory.c +4 -4
@@ -1637,8 +1637,8 @@ int vm_insert_pfn_prot(struct vm_area_struct *vma, unsigned long addr,if (addr < vma->vm_start || addr >= vma->vm_end)return -EFAULT ; -if (track_pfn_insert (vma, &pgprot,__pfn_to_pfn_t (pfn,PFN_DEV ))) -return -EINVAL ; + +track_pfn_insert (vma, &pgprot,__pfn_to_pfn_t (pfn,PFN_DEV )); ret =insert_pfn (vma, addr,__pfn_to_pfn_t (pfn,PFN_DEV ), pgprot);
@@ -1655,8 +1655,8 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,if (addr < vma->vm_start || addr >= vma->vm_end)return -EFAULT ; -if (track_pfn_insert (vma, &pgprot, pfn)) -return -EINVAL ; + +track_pfn_insert (vma, &pgprot, pfn);/* * If we don't have pte special, then we have to use the pfn_valid()