diff options
| author | Mark Rustad <mark.d.rustad@intel.com> | 2014-07-25 06:27:05 -0700 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-07-25 16:05:54 +0200 |
| commit | b55a8144d1807f9e74c51cb584f0dd198483d86c (patch) | |
| tree | 307e87c61250e476bff91d45ef34eff2c9fa7186 /arch/x86/kvm | |
| parent | 25f97ff451a4aab534afc1290af97d23ea0b4fb3 (diff) | |
| download | linux-b55a8144d1807f9e74c51cb584f0dd198483d86c.tar.bz2 | |
x86/kvm: Resolve shadow warning from min macro
Resolve a shadow warning generated in W=2 builds by the nested
use of the min macro by instead using the min3 macro for the
minimum of 3 values.
Signed-off-by: Mark Rustad <mark.d.rustad@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm')
| -rw-r--r-- | arch/x86/kvm/emulate.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index 57743edfb4e2..56657b0bb3bb 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -1317,8 +1317,7 @@ static int pio_in_emulated(struct x86_emulate_ctxt *ctxt, in_page = (ctxt->eflags & EFLG_DF) ? offset_in_page(reg_read(ctxt, VCPU_REGS_RDI)) : PAGE_SIZE - offset_in_page(reg_read(ctxt, VCPU_REGS_RDI)); - n = min(min(in_page, (unsigned int)sizeof(rc->data)) / size, - count); + n = min3(in_page, (unsigned int)sizeof(rc->data) / size, count); if (n == 0) n = 1; rc->pos = rc->end = 0; |