Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0719dbf5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'mm-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull mm/PAT cleanup from Ingo Molnar:
 "A single cleanup for a generic interface that was originally
  introduced for PAT"

* 'mm-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/pat, mm: Make track_pfn_insert() return void
parents 6cdf89b1 308a047c

arch/x86/mm/pat.c

+2 −5
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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,

static inline void track_pfn_insert(struct vm_area_struct *vma, pgprot_t *prot,

				    pfn_t pfn)

{

	return 0;

}



/*
@@ -593,7 +592,7 @@ 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,

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,

mm/huge_memory.c

+3 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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()