forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'kvm-ppc-queue' of git://github.com/agraf/linux-2.6 into queue

Browse source 
Conflicts:
	arch/powerpc/include/asm/processor.h
This commit is contained in:
Gleb Natapov 2013-11-04 10:20:57 +02:00
commit 95f328d3ad
73 changed files with 3420 additions and 1749 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/linux/kvm_host.h
View file

@ -507,9 +507,10 @@ int kvm_set_memory_region(struct kvm *kvm,
struct kvm_userspace_memory_region *mem);
int __kvm_set_memory_region(struct kvm *kvm,
struct kvm_userspace_memory_region *mem);
void kvm_arch_free_memslot(struct kvm_memory_slot *free,
void kvm_arch_free_memslot(struct kvm *kvm, struct kvm_memory_slot *free,
struct kvm_memory_slot *dont);
int kvm_arch_create_memslot(struct kvm_memory_slot *slot, unsigned long npages);
int kvm_arch_create_memslot(struct kvm *kvm, struct kvm_memory_slot *slot,
unsigned long npages);
void kvm_arch_memslots_updated(struct kvm *kvm);
int kvm_arch_prepare_memory_region(struct kvm *kvm,
struct kvm_memory_slot *memslot,