ia64/xen-unstable

changeset 1814:ae33aca75a3e

bitkeeper revision 1.1104 (40f834b0XKxLqwV45R5DkTjgl6UzaQ)

Stop compile warnings.
author kaf24@scramble.cl.cam.ac.uk
date Fri Jul 16 20:04:00 2004 +0000 (2004-07-16)
parents 66e83b24aca7
children 94e737d8be1b 4e0d79404699
files linux-2.4.26-xen-sparse/arch/xen/drivers/balloon/balloon.c
line diff
     1.1 --- a/linux-2.4.26-xen-sparse/arch/xen/drivers/balloon/balloon.c	Fri Jul 16 19:55:59 2004 +0000
     1.2 +++ b/linux-2.4.26-xen-sparse/arch/xen/drivers/balloon/balloon.c	Fri Jul 16 20:04:00 2004 +0000
     1.3 @@ -228,7 +228,8 @@ static int balloon_write(struct file *fi
     1.4                           u_long count, void *data)
     1.5  {
     1.6      char memstring[64], *endchar;
     1.7 -    int len, i, pages;
     1.8 +    int len, i;
     1.9 +    unsigned long pages;
    1.10      unsigned long long target;
    1.11  
    1.12      /* Only admin can play with the balloon :) */
    1.13 @@ -259,7 +260,7 @@ static int balloon_write(struct file *fi
    1.14  	    if (change<0) return change;
    1.15  
    1.16  	    current_pages -= change;
    1.17 -    	    printk("Relinquish %dMB to xen. Domain now has %dMB\n",
    1.18 +    	    printk("Relinquish %dMB to xen. Domain now has %ldMB\n",
    1.19  		    change>>PAGE_TO_MB_SHIFT, current_pages>>PAGE_TO_MB_SHIFT);
    1.20      }
    1.21      else if (pages > current_pages) {
    1.22 @@ -267,7 +268,7 @@ static int balloon_write(struct file *fi
    1.23  	    if (change<0) return change;
    1.24  
    1.25  	    current_pages += change;
    1.26 -    	    printk("Reclaim %dMB from xen. Domain now has %dMB\n",
    1.27 +    	    printk("Reclaim %dMB from xen. Domain now has %ldMB\n",
    1.28  		    change>>PAGE_TO_MB_SHIFT, current_pages>>PAGE_TO_MB_SHIFT);
    1.29      }
    1.30  
    1.31 @@ -279,7 +280,7 @@ static int balloon_read(char *page, char
    1.32  	  int count, int *eof, void *data)
    1.33  {
    1.34  	int len;
    1.35 -	len = sprintf(page,"%ul\n",current_pages<<PAGE_SHIFT);
    1.36 +	len = sprintf(page,"%lu\n",current_pages<<PAGE_SHIFT);
    1.37  
    1.38  	if (len <= off+count) *eof = 1;
    1.39  	*start = page + off;