From: James Hogan <james.hogan@imgtec.com>
Date: Thu, 9 Feb 2017 15:20:06 +0000 (+0000)
Subject: Merge tag 'mips_kvm_4.11_1' into mips-for-linux-next
X-Git-Tag: v4.11-rc1~135^2~22
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f700a420088624671ed955bf818c17012bb57bca;p=karo-tx-linux.git

Merge tag 'mips_kvm_4.11_1' into mips-for-linux-next

MIPS dependencies for KVM

Miscellaneous MIPS architecture changes depended on by the MIPS KVM
changes in the KVM tree.

- Move pgd_alloc() out of header.
- Exports so KVM can access page table management and TLBEX functions.
- Add return errors to protected cache ops.
---

f700a420088624671ed955bf818c17012bb57bca
diff --cc arch/mips/mm/init.c
index 9d1d54b8e1e8,653569bc0da7..aa75849c36bc
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@@ -539,6 -538,6 +539,7 @@@ unsigned long pgd_current[NR_CPUS]
  pgd_t swapper_pg_dir[_PTRS_PER_PGD] __section(.bss..swapper_pg_dir);
  #ifndef __PAGETABLE_PMD_FOLDED
  pmd_t invalid_pmd_table[PTRS_PER_PMD] __page_aligned_bss;
+ EXPORT_SYMBOL_GPL(invalid_pmd_table);
  #endif
  pte_t invalid_pte_table[PTRS_PER_PTE] __page_aligned_bss;
 +EXPORT_SYMBOL(invalid_pte_table);