Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cacf061c authored by Andrea Arcangeli's avatar Andrea Arcangeli Committed by Linus Torvalds
Browse files

thp: fix PARAVIRT x86 32bit noPAE 



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: default avatarAndrea Arcangeli <aarcange@redhat.com>
Reported-by: default avatarwerner <w.landgraf@ru.ru>
Reported-by: default avatarMinchan Kim <minchan.kim@gmail.com>
Tested-by: default avatarMinchan Kim <minchan.kim@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6663050e

arch/x86/include/asm/paravirt.h

+2 −3
Original line number Diff line number Diff line
@@ -558,13 +558,12 @@ static inline void set_pte_at(struct mm_struct *mm, unsigned long addr, 
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