]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
Merge tag 'mips_kvm_4.11_1' into mips-for-linux-next
authorJames Hogan <james.hogan@imgtec.com>
Thu, 9 Feb 2017 15:20:06 +0000 (15:20 +0000)
committerJames Hogan <james.hogan@imgtec.com>
Mon, 13 Feb 2017 18:57:31 +0000 (18:57 +0000)
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.

1  2 
arch/mips/mm/init.c
arch/mips/mm/tlbex.c

index 9d1d54b8e1e80dd7835dd74e4dc9d316ebc350ee,653569bc0da73a5f068c2079641e27e26753a562..aa75849c36bcdd79489e4933d334232985d298c5
@@@ -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);
Simple merge