The patch titled
thp: fix PARAVIRT x86 32bit noPAE
has been added to the -mm tree. Its filename is
thp-fix-paravirt-x86-32bit-nopae.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: thp: fix PARAVIRT x86 32bit noPAE
From: Andrea Arcangeli <aarcange@xxxxxxxxxx>
This fixes TRANSPARENT_HUGEPAGE=y with PARAVIRT=y and HIGHMEM64=n.
The #ifdef that this patch removes was erratically introduced to fix a
build error for noPAE (where pmd.pmd doesn't exist). So then the kernel
built but it failed at runtime because set_pmd_at was a noop. This will
correct it by enabling set_pmd_at for noPAE mode too.
Signed-off-by: Andrea Arcangeli <aarcange@xxxxxxxxxx>
Reported-by: werner <w.landgraf@xxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/x86/include/asm/paravirt.h | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff -puN arch/x86/include/asm/paravirt.h~thp-fix-paravirt-x86-32bit-nopae arch/x86/include/asm/paravirt.h
--- a/arch/x86/include/asm/paravirt.h~thp-fix-paravirt-x86-32bit-nopae
+++ a/arch/x86/include/asm/paravirt.h
@@ -558,13 +558,12 @@ static inline void set_pte_at(struct mm_
static inline void set_pmd_at(struct mm_struct *mm, unsigned long addr,
pmd_t *pmdp, pmd_t pmd)
{
-#if PAGETABLE_LEVELS >= 3
if (sizeof(pmdval_t) > sizeof(long))
/* 5 arg words */
pv_mmu_ops.set_pmd_at(mm, addr, pmdp, pmd);
else
- PVOP_VCALL4(pv_mmu_ops.set_pmd_at, mm, addr, pmdp, pmd.pmd);
-#endif
+ PVOP_VCALL4(pv_mmu_ops.set_pmd_at, mm, addr, pmdp,
+ native_pmd_val(pmd));
}
#endif
_
Patches currently in -mm which might be from aarcange@xxxxxxxxxx are
origin.patch
mm-systems-without-mmu-do-not-need-pte_mkwrite.patch
thp-fix-paravirt-x86-32bit-nopae.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
