Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96d33b08 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents a8b33654 0c8eb04a

arch/x86/kernel/kvm.c

+1 −1
Original line number Diff line number Diff line
@@ -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");

virt/kvm/kvm_main.c

+1 −1
Original line number Diff line number Diff line
@@ -3091,7 +3091,7 @@ static const struct file_operations *stat_fops[] = { 


static int kvm_init_debug(void)

{

	int r = -EFAULT;

	int r = -EEXIST;

	struct kvm_stats_debugfs_item *p;



	kvm_debugfs_dir = debugfs_create_dir("kvm", NULL);