summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorKirill A. Shutemov <kirill.shutemov@linux.intel.com>2016-05-11 09:51:53 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2016-05-13 13:24:40 +1000
commit20d3ff1d96ddc44ec271faa55f6160ff7f1cb3c3 (patch)
tree2140dfbf0f60ed247e69316cd8be067bdd965f32 /mm
parent21204c93853ff9d9f939c7df1b6b61fd9ff044ad (diff)
khugepaged: __collapse_huge_page_swapin(): drop unused 'pte' parameter
'pte' dereference is eliminated by compiler, since nobody uses the pteval until it's overwritten inside the loop. Value of 'pte' itself is overwritten by pte_offset_map() before first real use. Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Cc: Ebru Akagunduz <ebru.akagunduz@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/huge_memory.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index b36428bde82d..5509cd610295 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -2384,11 +2384,10 @@ static bool hugepage_vma_check(struct vm_area_struct *vma)
static void __collapse_huge_page_swapin(struct mm_struct *mm,
struct vm_area_struct *vma,
- unsigned long address, pmd_t *pmd,
- pte_t *pte)
+ unsigned long address, pmd_t *pmd)
{
unsigned long _address;
- pte_t pteval = *pte;
+ pte_t *pte, pteval;
int swapped_in = 0, ret = 0;
pte = pte_offset_map(pmd, address);
@@ -2482,7 +2481,7 @@ static void collapse_huge_page(struct mm_struct *mm,
anon_vma_lock_write(vma->anon_vma);
- __collapse_huge_page_swapin(mm, vma, address, pmd, pte);
+ __collapse_huge_page_swapin(mm, vma, address, pmd);
pte = pte_offset_map(pmd, address);
pte_ptl = pte_lockptr(mm, pmd);