diff for duplicates of <20150917132825.GA30954@node.dhcp.inet.fi> diff --git a/a/1.txt b/N1/1.txt index ce38608..3656a16 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -11,3 +11,51 @@ And the value is not really used in __collapse_huge_page_swapin(). > pte = pte_offset_map(pmd, address); > pte_ptl = pte_lockptr(mm, pmd); + + +>From 76783e1dfb22cde04cf46903336810df8a632617 Mon Sep 17 00:00:00 2001 +From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> +Date: Thu, 17 Sep 2015 16:23:30 +0300 +Subject: [PATCH] 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> +--- + mm/huge_memory.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/mm/huge_memory.c b/mm/huge_memory.c +index 4b057abd8615..5ad5c443cc94 100644 +--- a/mm/huge_memory.c ++++ b/mm/huge_memory.c +@@ -2628,11 +2628,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); +@@ -2730,7 +2729,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); +-- + Kirill A. Shutemov diff --git a/a/content_digest b/N1/content_digest index 8141da9..0f4f143 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -37,6 +37,54 @@ "And the value is not really used in __collapse_huge_page_swapin().\n" "\n" "> \tpte = pte_offset_map(pmd, address);\n" - "> \tpte_ptl = pte_lockptr(mm, pmd);" + "> \tpte_ptl = pte_lockptr(mm, pmd);\n" + "\n" + "\n" + ">From 76783e1dfb22cde04cf46903336810df8a632617 Mon Sep 17 00:00:00 2001\n" + "From: \"Kirill A. Shutemov\" <kirill.shutemov@linux.intel.com>\n" + "Date: Thu, 17 Sep 2015 16:23:30 +0300\n" + "Subject: [PATCH] khugepaged: __collapse_huge_page_swapin(): drop unused 'pte'\n" + " parameter\n" + "\n" + "'pte' dereference is eliminated by compiler, since nobody uses the\n" + "pteval until it's overwritten inside the loop.\n" + "\n" + "Value of 'pte' itself is overwritten by pte_offset_map() before first\n" + "real use.\n" + "\n" + "Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>\n" + "---\n" + " mm/huge_memory.c | 7 +++----\n" + " 1 file changed, 3 insertions(+), 4 deletions(-)\n" + "\n" + "diff --git a/mm/huge_memory.c b/mm/huge_memory.c\n" + "index 4b057abd8615..5ad5c443cc94 100644\n" + "--- a/mm/huge_memory.c\n" + "+++ b/mm/huge_memory.c\n" + "@@ -2628,11 +2628,10 @@ static bool hugepage_vma_check(struct vm_area_struct *vma)\n" + " \n" + " static void __collapse_huge_page_swapin(struct mm_struct *mm,\n" + " \t\t\t\t\tstruct vm_area_struct *vma,\n" + "-\t\t\t\t\tunsigned long address, pmd_t *pmd,\n" + "-\t\t\t\t\tpte_t *pte)\n" + "+\t\t\t\t\tunsigned long address, pmd_t *pmd)\n" + " {\n" + " \tunsigned long _address;\n" + "-\tpte_t pteval = *pte;\n" + "+\tpte_t *pte, pteval;\n" + " \tint swapped_in = 0, ret = 0;\n" + " \n" + " \tpte = pte_offset_map(pmd, address);\n" + "@@ -2730,7 +2729,7 @@ static void collapse_huge_page(struct mm_struct *mm,\n" + " \n" + " \tanon_vma_lock_write(vma->anon_vma);\n" + " \n" + "-\t__collapse_huge_page_swapin(mm, vma, address, pmd, pte);\n" + "+\t__collapse_huge_page_swapin(mm, vma, address, pmd);\n" + " \n" + " \tpte = pte_offset_map(pmd, address);\n" + " \tpte_ptl = pte_lockptr(mm, pmd);\n" + "-- \n" + Kirill A. Shutemov -4a2b1a8560cf5fe39f35f32c2a6cb6b967339584895f8bcd2cc6d712f74f973a +7e5fbc1ba67a148fbd54ed47632ca1be21645dd21676061dcce6b2534bb1afa2
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.