Merge branch 'next/kvm' into mips-for-linux-next

This commit is contained in:
Ralf Baechle
2013-05-09 17:56:40 +02:00
42 changed files with 7412 additions and 18 deletions

View File

@@ -1712,7 +1712,12 @@ void __init trap_init(void)
ebase = (unsigned long)
__alloc_bootmem(size, 1 << fls(size), 0);
} else {
ebase = CKSEG0;
#ifdef CONFIG_KVM_GUEST
#define KVM_GUEST_KSEG0 0x40000000
ebase = KVM_GUEST_KSEG0;
#else
ebase = CKSEG0;
#endif
if (cpu_has_mips_r2)
ebase += (read_c0_ebase() & 0x3ffff000);
}