Skip to content

Commit

Permalink
khugepaged: __collapse_huge_page_swapin(): drop unused 'pte' parameter
Browse files Browse the repository at this point in the history
'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>
  • Loading branch information
kiryl authored and sfrothwell committed Jun 25, 2016
1 parent c400b73 commit f454c38
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions mm/huge_memory.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit f454c38

Please sign in to comment.