summaryrefslogtreecommitdiffstats
path: root/arch/x86/include
diff options
context:
space:
mode:
authorDarren Hart (VMware) <dvhart@infradead.org>2017-04-17 15:30:28 -0700
committerDarren Hart (VMware) <dvhart@infradead.org>2017-04-17 15:30:28 -0700
commit86074b85c48cc9c821aa6197306d307d314c0063 (patch)
tree3a3a31d0cd8ccd4d8a162f5bcd28e44fe89e059d /arch/x86/include
parent298747b7579f5bbbced793d997b333fd10a24921 (diff)
parentd1d84bb95364ed604015c2b788caaf3dbca0262f (diff)
downloadop-kernel-dev-86074b85c48cc9c821aa6197306d307d314c0063.zip
op-kernel-dev-86074b85c48cc9c821aa6197306d307d314c0063.tar.gz
Merge branch 'i2c/for-INT33FE'
Merge branch 'i2c/for-INT33FE' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git to prepare for an incoming INT33FE driver. Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/pgtable-3level.h3
-rw-r--r--arch/x86/include/asm/pgtable.h2
2 files changed, 1 insertions, 4 deletions
diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
index 72277b1..50d35e3 100644
--- a/arch/x86/include/asm/pgtable-3level.h
+++ b/arch/x86/include/asm/pgtable-3level.h
@@ -121,12 +121,9 @@ static inline void native_pmd_clear(pmd_t *pmd)
*(tmp + 1) = 0;
}
-#if !defined(CONFIG_SMP) || (defined(CONFIG_HIGHMEM64G) && \
- defined(CONFIG_PARAVIRT))
static inline void native_pud_clear(pud_t *pudp)
{
}
-#endif
static inline void pud_clear(pud_t *pudp)
{
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
index 1cfb36b..585ee0d 100644
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
@@ -62,7 +62,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
# define set_pud(pudp, pud) native_set_pud(pudp, pud)
#endif
-#ifndef __PAGETABLE_PMD_FOLDED
+#ifndef __PAGETABLE_PUD_FOLDED
#define pud_clear(pud) native_pud_clear(pud)
#endif
OpenPOWER on IntegriCloud