ia64/xen-unstable

changeset 4632:1caa83c98dee

bitkeeper revision 1.1365 (42682a52hWoXmZEjWb2-0Ly05egFKg)

Hand merged...

Signed-off-by: michael.fetterman@cl.cam.ac.uk
author maf46@burn.cl.cam.ac.uk
date Thu Apr 21 22:33:54 2005 +0000 (2005-04-21)
parents e4e76c16ec78 2fdf5cc2b79b
children 18a8f5216548
files xen/arch/x86/vmx_io.c
line diff
     1.1 --- a/xen/arch/x86/vmx_io.c	Thu Apr 21 20:53:42 2005 +0000
     1.2 +++ b/xen/arch/x86/vmx_io.c	Thu Apr 21 22:33:54 2005 +0000
     1.3 @@ -299,7 +299,7 @@ static __inline__ int generic_fls(u32 x)
     1.4      int r = 31;
     1.5  
     1.6      if (!x)
     1.7 -        return 0;
     1.8 +        return -1;
     1.9      if (!(x & 0xffff0000u)) {
    1.10          x <<= 16;
    1.11          r -= 16;