diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2016-02-25 11:52:58 +0100 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-02-25 11:52:58 +0100 |
commit | 2527083cb831024d22a03f68f54f6a46ecf5bf6c (patch) | |
tree | 41de92d988a4deccb2d5087a964a51682f155e99 /include | |
parent | powerpc: Fix BUG_ON() reporting in real mode (diff) | |
parent | powerpc/mm/hash: Clear the invalid slot information correctly (diff) | |
download | linux-2527083cb831024d22a03f68f54f6a46ecf5bf6c.tar.xz linux-2527083cb831024d22a03f68f54f6a46ecf5bf6c.zip |
Merge tag 'powerpc-4.5-4' into next
Pull in our current fixes from 4.5, in particular the "Fix Multi hit
ERAT" bug is causing folks some grief when testing next.
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-generic/pgtable.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h index 0b3c0d39ef75..c370b261c720 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h @@ -239,6 +239,14 @@ extern void pmdp_invalidate(struct vm_area_struct *vma, unsigned long address, pmd_t *pmdp); #endif +#ifndef __HAVE_ARCH_PMDP_HUGE_SPLIT_PREPARE +static inline void pmdp_huge_split_prepare(struct vm_area_struct *vma, + unsigned long address, pmd_t *pmdp) +{ + +} +#endif + #ifndef __HAVE_ARCH_PTE_SAME static inline int pte_same(pte_t pte_a, pte_t pte_b) { |