2015-02-13, 16:56:15 +1100, Stephen Rothwell wrote:
> Hi all,
>
> Please do not add any material destined for v3.21 to your linux-next
> included trees until after v3.20-rc1 has been released.
>
> Changes since 20150212:
Hi Stephen,
Your conflict resolution in
8fe7fba50596 "Merge branch 'akpm-current/current'"
for mm/memory.c looks a bit off. I get flooded with these messages:
BUG: non-zero nr_pmds on freeing mm: 4
and fixed it with:
diff --git a/mm/memory.c b/mm/memory.c
index 450e4952c5ef..802adda2b0b6 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -3350,7 +3350,6 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
smp_wmb(); /* See comment in __pte_alloc */
spin_lock(&mm->page_table_lock);
- mm_inc_nr_pmds(mm);
#ifndef __ARCH_HAS_4LEVEL_HACK
if (!pud_present(*pud)) {
mm_inc_nr_pmds(mm);
references:
http://www.spinics.net/lists/linux-mm/msg84294.html
dc6c9a35b66b "mm: account pmd page tables to the process"
[CC'ed Kirill A. Shutemov]
Thanks
--
Sabrina
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
