summaryrefslogtreecommitdiffstats
path: root/arch/mips/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-05-23 09:18:08 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-05-23 09:18:08 -0700
commit72dd4e7980bf584fa11db4f00e38d5cf956a8856 (patch)
treefed8bc25883a01dc2e4916fe90a58f07b26ed93b /arch/mips/include
parentb4d3ba3346f092b9185da991414775281ceacaac (diff)
parent6d17c0d1e8a66f5508082cb0fecb8afb7e9a21e4 (diff)
downloadop-kernel-dev-72dd4e7980bf584fa11db4f00e38d5cf956a8856.zip
op-kernel-dev-72dd4e7980bf584fa11db4f00e38d5cf956a8856.tar.gz
Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull kvm bugfixes from Gleb Natapov. * git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM/MIPS32: Wrap calls to gfn_to_pfn() with srcu_read_lock/unlock() KVM/MIPS32: Move include/asm/kvm.h => include/uapi/asm/kvm.h since it is a user visible API. KVM: take over co-maintainership from Marcelo, fix MAINTAINERS entry
Diffstat (limited to 'arch/mips/include')
-rw-r--r--arch/mips/include/uapi/asm/kvm.h (renamed from arch/mips/include/asm/kvm.h)0
1 files changed, 0 insertions, 0 deletions
diff --git a/arch/mips/include/asm/kvm.h b/arch/mips/include/uapi/asm/kvm.h
index 85789ea..85789ea 100644
--- a/arch/mips/include/asm/kvm.h
+++ b/arch/mips/include/uapi/asm/kvm.h
OpenPOWER on IntegriCloud