summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-10-30 12:25:15 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-10-30 12:25:15 -0700
commit96d33b086ba9442c189c6f7712ad49ba0240e680 (patch)
tree7fcd984ef8106d9b4c2dd27467df726569b42ca6 /arch
parenta8b33654b1e3b0c74d4a1fed041c9aae50b3c427 (diff)
parent0c8eb04a6241da28deb108181213b791c378123b (diff)
downloadlinux-96d33b086ba9442c189c6f7712ad49ba0240e680.tar.gz
linux-96d33b086ba9442c189c6f7712ad49ba0240e680.tar.bz2
linux-96d33b086ba9442c189c6f7712ad49ba0240e680.zip
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull KVM fixes from Paolo Bonzini: "Fixes for the 3.12 debugfs problem - removing the duplicate directory name, and using a better the error code" * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: use a more sensible error number when debugfs directory creation fails KVM: Fix modprobe failure for kvm_intel/kvm_amd
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/kvm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
index a0e2a8a80c94..b2046e4d0b59 100644
--- a/arch/x86/kernel/kvm.c
+++ b/arch/x86/kernel/kvm.c
@@ -609,7 +609,7 @@ static struct dentry *d_kvm_debug;
struct dentry *kvm_init_debugfs(void)
{
- d_kvm_debug = debugfs_create_dir("kvm", NULL);
+ d_kvm_debug = debugfs_create_dir("kvm-guest", NULL);
if (!d_kvm_debug)
printk(KERN_WARNING "Could not create 'kvm' debugfs directory\n");