ia64/xen-unstable

changeset 15472:40608e5e394e

[IA64] Better warning fix

This fixes it for gcc-3.x too.

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
author Alex Williamson <alex.williamson@hp.com>
date Mon Jul 02 21:06:46 2007 -0600 (2007-07-02)
parents 813e945ef5b6
children 34f285b57b87
files xen/arch/ia64/xen/vcpu.c
line diff
     1.1 --- a/xen/arch/ia64/xen/vcpu.c	Mon Jul 02 14:29:36 2007 -0600
     1.2 +++ b/xen/arch/ia64/xen/vcpu.c	Mon Jul 02 21:06:46 2007 -0600
     1.3 @@ -496,7 +496,7 @@ IA64FAULT vcpu_set_psr(VCPU * vcpu, u64 
     1.4  	PSCB(vcpu, interrupt_collection_enabled) = vpsr.ic;
     1.5  	vcpu_set_metaphysical_mode(vcpu, !(vpsr.dt && vpsr.rt && vpsr.it));
     1.6  
     1.7 -	newpsr.cpl |= max((u64)vpsr.cpl, (u64)CONFIG_CPL0_EMUL);
     1.8 +	newpsr.cpl |= max_t(u64, vpsr.cpl, CONFIG_CPL0_EMUL);
     1.9  
    1.10  	if (PSCB(vcpu, banknum)	!= vpsr.bn) {
    1.11  		if (vpsr.bn)