x86/kvm: Resolve shadow warning from min macro
authorMark Rustad <mark.d.rustad@intel.com>
Fri, 25 Jul 2014 13:27:05 +0000 (06:27 -0700)
committerPaolo Bonzini <pbonzini@redhat.com>
Fri, 25 Jul 2014 14:05:54 +0000 (16:05 +0200)
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>
arch/x86/kvm/emulate.c

Simple merge