diff options
author | Kirill A. Shutemov <kirill.shutemov@linux.intel.com> | 2016-01-15 19:53:39 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-15 20:56:32 -0500 |
commit | 4b471e8898c3d0f5c97a3c73ac32d0549fe01c87 (patch) | |
tree | 644aa22e14f779dc7aad0d169cfbd8abe9fdc6a6 /fs/proc | |
parent | 1f19617d775879c0863e697fb648154e56918051 (diff) |
mm, thp: remove infrastructure for handling splitting PMDs
With new refcounting we don't need to mark PMDs splitting. Let's drop
code to handle this.
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Tested-by: Sasha Levin <sasha.levin@oracle.com>
Tested-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Acked-by: Jerome Marchand <jmarchan@redhat.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Rik van Riel <riel@redhat.com>
Cc: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Cc: Steve Capper <steve.capper@linaro.org>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Christoph Lameter <cl@linux.com>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/proc')
-rw-r--r-- | fs/proc/task_mmu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index b74e7dec37dd..65a1b6c69c11 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c | |||
@@ -602,7 +602,7 @@ static int smaps_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, | |||
602 | pte_t *pte; | 602 | pte_t *pte; |
603 | spinlock_t *ptl; | 603 | spinlock_t *ptl; |
604 | 604 | ||
605 | if (pmd_trans_huge_lock(pmd, vma, &ptl) == 1) { | 605 | if (pmd_trans_huge_lock(pmd, vma, &ptl)) { |
606 | smaps_pmd_entry(pmd, addr, walk); | 606 | smaps_pmd_entry(pmd, addr, walk); |
607 | spin_unlock(ptl); | 607 | spin_unlock(ptl); |
608 | return 0; | 608 | return 0; |
@@ -913,7 +913,7 @@ static int clear_refs_pte_range(pmd_t *pmd, unsigned long addr, | |||
913 | spinlock_t *ptl; | 913 | spinlock_t *ptl; |
914 | struct page *page; | 914 | struct page *page; |
915 | 915 | ||
916 | if (pmd_trans_huge_lock(pmd, vma, &ptl) == 1) { | 916 | if (pmd_trans_huge_lock(pmd, vma, &ptl)) { |
917 | if (cp->type == CLEAR_REFS_SOFT_DIRTY) { | 917 | if (cp->type == CLEAR_REFS_SOFT_DIRTY) { |
918 | clear_soft_dirty_pmd(vma, addr, pmd); | 918 | clear_soft_dirty_pmd(vma, addr, pmd); |
919 | goto out; | 919 | goto out; |
@@ -1187,7 +1187,7 @@ static int pagemap_pmd_range(pmd_t *pmdp, unsigned long addr, unsigned long end, | |||
1187 | int err = 0; | 1187 | int err = 0; |
1188 | 1188 | ||
1189 | #ifdef CONFIG_TRANSPARENT_HUGEPAGE | 1189 | #ifdef CONFIG_TRANSPARENT_HUGEPAGE |
1190 | if (pmd_trans_huge_lock(pmdp, vma, &ptl) == 1) { | 1190 | if (pmd_trans_huge_lock(pmdp, vma, &ptl)) { |
1191 | u64 flags = 0, frame = 0; | 1191 | u64 flags = 0, frame = 0; |
1192 | pmd_t pmd = *pmdp; | 1192 | pmd_t pmd = *pmdp; |
1193 | 1193 | ||
@@ -1519,7 +1519,7 @@ static int gather_pte_stats(pmd_t *pmd, unsigned long addr, | |||
1519 | pte_t *orig_pte; | 1519 | pte_t *orig_pte; |
1520 | pte_t *pte; | 1520 | pte_t *pte; |
1521 | 1521 | ||
1522 | if (pmd_trans_huge_lock(pmd, vma, &ptl) == 1) { | 1522 | if (pmd_trans_huge_lock(pmd, vma, &ptl)) { |
1523 | pte_t huge_pte = *(pte_t *)pmd; | 1523 | pte_t huge_pte = *(pte_t *)pmd; |
1524 | struct page *page; | 1524 | struct page *page; |
1525 | 1525 | ||