Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1248679

[PATCH 2/3] mm: clear_soft_dirty_pmd requires THP

Show all headers | View raw

Don't build clear_soft_dirty_pmd() if the transparent huge pages are
not enabled.

Signed-off-by: Laurent Dufour <ldufour@linux.vnet.ibm.com>
CC: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
---
 fs/proc/task_mmu.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index c9454ee39b28..fa847a982a9f 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -762,7 +762,14 @@ static inline void clear_soft_dirty(struct vm_area_struct *vma,
 		set_pte_at(vma->vm_mm, addr, pte, ptent);
 	}
 }
+#else
+static inline void clear_soft_dirty(struct vm_area_struct *vma,
+		unsigned long addr, pte_t *pte)
+{
+}
+#endif
 
+#if defined(CONFIG_MEM_SOFT_DIRTY) && defined(CONFIG_TRANSPARENT_HUGEPAGE)
 static inline void clear_soft_dirty_pmd(struct vm_area_struct *vma,
 		unsigned long addr, pmd_t *pmdp)
 {
@@ -776,14 +783,7 @@ static inline void clear_soft_dirty_pmd(struct vm_area_struct *vma,
 
 	set_pmd_at(vma->vm_mm, addr, pmdp, pmd);
 }
-
 #else
-
-static inline void clear_soft_dirty(struct vm_area_struct *vma,
-		unsigned long addr, pte_t *pte)
-{
-}
-
 static inline void clear_soft_dirty_pmd(struct vm_area_struct *vma,
 		unsigned long addr, pmd_t *pmdp)
 {
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/3] mm/powerpc: enabling memory soft dirty tracking  Laurent Dufour <ldufour@linux.vnet.ibm.com> - 2015-10-16 14:10 +0200
  [PATCH 1/3] mm: clearing pte in clear_soft_dirty() Laurent Dufour <ldufour@linux.vnet.ibm.com> - 2015-10-16 14:10 +0200
    Re: [PATCH 1/3] mm: clearing pte in clear_soft_dirty() Benjamin Herrenschmidt <benh@kernel.crashing.org> - 2015-10-16 17:30 +0200
    Re: [PATCH 1/3] mm: clearing pte in clear_soft_dirty() "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> - 2015-10-17 14:20 +0200
  [PATCH 2/3] mm: clear_soft_dirty_pmd requires THP Laurent Dufour <ldufour@linux.vnet.ibm.com> - 2015-10-16 14:10 +0200
    Re: [PATCH 2/3] mm: clear_soft_dirty_pmd requires THP "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> - 2015-10-17 14:20 +0200
  Re: [PATCH 0/3] mm/powerpc: enabling memory soft dirty tracking Andrew Morton <akpm@linux-foundation.org> - 2015-10-16 23:20 +0200
    Re: [PATCH 0/3] mm/powerpc: enabling memory soft dirty tracking Benjamin Herrenschmidt <benh@kernel.crashing.org> - 2015-10-17 04:20 +0200
    Re: [PATCH 0/3] mm/powerpc: enabling memory soft dirty tracking "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> - 2015-10-17 14:10 +0200

csiph-web