From af8071ce3168509e372a2c6108bc0c758f79e49c Mon Sep 17 00:00:00 2001

From: Dave Jiang <dave.jiang@intel.com>

Date: Mon, 27 Feb 2017 14:44:40 -0700

Subject: [PATCH] mm, x86: fix HIGHMEM64 && PARAVIRT build config for

 native_pud_clear()

Looks like I also missed the build config that includes

CONFIG_HIGHMEM64G && CONFIG_PARAVIRT to export the native_pud_clear()

dummy function.

Fix: commit e5d56efc ("mm,x86: fix SMP x86 32bit build for native_pud_clear()")

Reported-by: Laura Abbott <labbott@redhat.com>

Reported-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>

Signed-off-by: Dave Jiang <dave.jiang@intel.com>

---

 arch/x86/include/asm/pgtable-3level.h | 3 ++-

 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h

index 8f50fb3..72277b1 100644

--- a/arch/x86/include/asm/pgtable-3level.h

+++ b/arch/x86/include/asm/pgtable-3level.h

@@ -121,7 +121,8 @@ static inline void native_pmd_clear(pmd_t *pmd)

 	*(tmp + 1) = 0;

 }

-#ifndef CONFIG_SMP

+#if !defined(CONFIG_SMP) || (defined(CONFIG_HIGHMEM64G) && \

+		defined(CONFIG_PARAVIRT))

 static inline void native_pud_clear(pud_t *pudp)

 {

 }

-- 

2.7.4