diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-12 11:14:52 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-12 11:14:52 -0800 |
| commit | 0719dbf5e1e802f1bcd0b8d8fc7639d5d1584d48 (patch) | |
| tree | 5d7271c75110638c635265fe8b49c7ad98e90095 /arch/x86 | |
| parent | Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
| parent | x86/pat, mm: Make track_pfn_insert() return void (diff) | |
| download | linux-dev-0719dbf5e1e802f1bcd0b8d8fc7639d5d1584d48.tar.xz linux-dev-0719dbf5e1e802f1bcd0b8d8fc7639d5d1584d48.zip | |
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
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/mm/pat.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c index 83e701f160a9..efc32bc6862b 100644 --- a/arch/x86/mm/pat.c +++ b/arch/x86/mm/pat.c @@ -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; } /* |