diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2009-09-03 11:35:35 -0400 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2009-09-10 11:11:11 -0400 |
commit | 28bcb112183cb822a394b155a2e7d788fe4a109a (patch) | |
tree | a784dcaa858cba4cf2676a65b6149d2980109bc1 | |
parent | 0a79b009525b160081d75cef5dbf45817956acf2 (diff) |
KVM: fix compile warnings on s390
CC arch/s390/kvm/../../../virt/kvm/kvm_main.o
arch/s390/kvm/../../../virt/kvm/kvm_main.c: In function '__kvm_set_memory_region':
arch/s390/kvm/../../../virt/kvm/kvm_main.c:485: warning: unused variable 'j'
arch/s390/kvm/../../../virt/kvm/kvm_main.c:484: warning: unused variable 'lpages'
arch/s390/kvm/../../../virt/kvm/kvm_main.c:483: warning: unused variable 'ugfn'
Cc: Carsten Otte <cotte@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
-rw-r--r-- | virt/kvm/kvm_main.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 1df4c0422f68..897bff3b7df9 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c | |||
@@ -1091,9 +1091,8 @@ int __kvm_set_memory_region(struct kvm *kvm, | |||
1091 | { | 1091 | { |
1092 | int r; | 1092 | int r; |
1093 | gfn_t base_gfn; | 1093 | gfn_t base_gfn; |
1094 | unsigned long npages, ugfn; | 1094 | unsigned long npages; |
1095 | int lpages; | 1095 | unsigned long i; |
1096 | unsigned long i, j; | ||
1097 | struct kvm_memory_slot *memslot; | 1096 | struct kvm_memory_slot *memslot; |
1098 | struct kvm_memory_slot old, new; | 1097 | struct kvm_memory_slot old, new; |
1099 | 1098 | ||
@@ -1171,6 +1170,9 @@ int __kvm_set_memory_region(struct kvm *kvm, | |||
1171 | goto skip_lpage; | 1170 | goto skip_lpage; |
1172 | 1171 | ||
1173 | for (i = 0; i < KVM_NR_PAGE_SIZES - 1; ++i) { | 1172 | for (i = 0; i < KVM_NR_PAGE_SIZES - 1; ++i) { |
1173 | unsigned long ugfn; | ||
1174 | unsigned long j; | ||
1175 | int lpages; | ||
1174 | int level = i + 2; | 1176 | int level = i + 2; |
1175 | 1177 | ||
1176 | /* Avoid unused variable warning if no large pages */ | 1178 | /* Avoid unused variable warning if no large pages */ |