[merged] mm-x86-fix-highmem64-paravirt-build-config-for-native_pud_clear.patch removed from -mm tree

[akpm@linux-foundation.org]

The patch titled
     Subject: mm, x86: fix HIGHMEM64 && PARAVIRT build config for native_pud_clear()
has been removed from the -mm tree.  Its filename was
     mm-x86-fix-highmem64-paravirt-build-config-for-native_pud_clear.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
From: Dave Jiang <dave.jiang@intel.com>
Subject: 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.

Fixes: a00cc7d9dd93d ("mm, x86: add support for PUD-sized transparent hugepages")
Link: http://lkml.kernel.org/r/148823188084.56076.17451228917824355200.stgit@djiang5-desk3.ch.intel.com
Signed-off-by: Dave Jiang <dave.jiang@intel.com>
Reported-by: Laura Abbott <labbott@redhat.com>
Reported-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: Matthew Wilcox <mawilcox@microsoft.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/x86/include/asm/pgtable-3level.h |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff -puN arch/x86/include/asm/pgtable-3level.h~mm-x86-fix-highmem64-paravirt-build-config-for-native_pud_clear arch/x86/include/asm/pgtable-3level.h
--- a/arch/x86/include/asm/pgtable-3level.h~mm-x86-fix-highmem64-paravirt-build-config-for-native_pud_clear
+++ a/arch/x86/include/asm/pgtable-3level.h
@@ -121,7 +121,8 @@ static inline void native_pmd_clear(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)
 {
 }
_

Patches currently in -mm which might be from dave.jiang@intel.com are