[Xen-changelog] [xen-unstable] [IA64] Better warning fix

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Alex Williamson <alex.williamson@xxxxxx>
# Date 1183432006 21600
# Node ID 40608e5e394ee4bcc5b68a4cbf49973f39327981
# Parent  813e945ef5b6a0ca3a98ea1700bad1483cee12d9
[IA64] Better warning fix

This fixes it for gcc-3.x too.

Signed-off-by: Alex Williamson <alex.williamson@xxxxxx>
---
 xen/arch/ia64/xen/vcpu.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -r 813e945ef5b6 -r 40608e5e394e xen/arch/ia64/xen/vcpu.c
--- a/xen/arch/ia64/xen/vcpu.c  Mon Jul 02 14:29:36 2007 -0600
+++ b/xen/arch/ia64/xen/vcpu.c  Mon Jul 02 21:06:46 2007 -0600
@@ -496,7 +496,7 @@ IA64FAULT vcpu_set_psr(VCPU * vcpu, u64 
        PSCB(vcpu, interrupt_collection_enabled) = vpsr.ic;
        vcpu_set_metaphysical_mode(vcpu, !(vpsr.dt && vpsr.rt && vpsr.it));
 
-       newpsr.cpl |= max((u64)vpsr.cpl, (u64)CONFIG_CPL0_EMUL);
+       newpsr.cpl |= max_t(u64, vpsr.cpl, CONFIG_CPL0_EMUL);
 
        if (PSCB(vcpu, banknum) != vpsr.bn) {
                if (vpsr.bn)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog