From: Heiko Carstens Date: Mon, 17 Jan 2011 20:21:08 +0000 (+0100) Subject: KVM: fix build warning within __kvm_set_memory_region() on s390 X-Git-Tag: firefly_0821_release~7613^2~2164^2~43 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d48ead8b0b48862a87138d04efb7580a1a25beb5;p=firefly-linux-kernel-4.4.55.git KVM: fix build warning within __kvm_set_memory_region() on s390 Get rid of this warning: CC arch/s390/kvm/../../../virt/kvm/kvm_main.o arch/s390/kvm/../../../virt/kvm/kvm_main.c:596:12: warning: 'kvm_create_dirty_bitmap' defined but not used The only caller of the function is within a !CONFIG_S390 section, so add the same ifdef around kvm_create_dirty_bitmap() as well. Signed-off-by: Heiko Carstens Signed-off-by: Marcelo Tosatti --- diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index a3a8f5fb369e..fd67bcde9980 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -588,6 +588,7 @@ static int kvm_vm_release(struct inode *inode, struct file *filp) return 0; } +#ifndef CONFIG_S390 /* * Allocation size is twice as large as the actual dirty bitmap size. * This makes it possible to do double buffering: see x86's @@ -608,6 +609,7 @@ static int kvm_create_dirty_bitmap(struct kvm_memory_slot *memslot) memslot->dirty_bitmap_head = memslot->dirty_bitmap; return 0; } +#endif /* !CONFIG_S390 */ /* * Allocate some memory and give it an address in the guest physical address