summaryrefslogtreecommitdiff
path: root/mm/huge_memory.c
diff options
context:
space:
mode:
authorKirill A. Shutemov <kirill.shutemov@linux.intel.com>2016-06-25 10:10:13 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2016-06-25 13:26:56 +1000
commitf454c3811e6d4a52f5b55580004c16b6f3d9eb3d (patch)
tree3a57ccd1a3e8b3793e8bc568f510879881c3b0eb /mm/huge_memory.c
parentc400b7360e6b3a8c1d1c7cc9ae1826c1c9b77a83 (diff)
downloadlinux-next-f454c3811e6d4a52f5b55580004c16b6f3d9eb3d.tar.gz
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/huge_memory.c')
-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 228c84da39ec..3890c9f1707a 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -2388,11 +2388,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);
@@ -2486,7 +2485,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);