ia64/xen-unstable

changeset 7519:c653a376cf52

Remove recently added uses of errno, as these cause trouble on ia64 builds.

Signed-off-by: Ewan Mellor <ewan@xensource.com>
author emellor@leeni.uk.xensource.com
date Mon Oct 24 18:21:38 2005 +0100 (2005-10-24)
parents 99ece3c06913
children 52f17d78dcd5
files linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c	Mon Oct 24 15:18:31 2005 +0100
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c	Mon Oct 24 18:21:38 2005 +0100
     1.3 @@ -81,7 +81,7 @@ static struct xs_handle xs_state;
     1.4  static LIST_HEAD(watches);
     1.5  static DEFINE_SPINLOCK(watches_lock);
     1.6  
     1.7 -/* List of pending watch calbback events, and a lock to protect it. */
     1.8 +/* List of pending watch callback events, and a lock to protect it. */
     1.9  static LIST_HEAD(watch_events);
    1.10  static DEFINE_SPINLOCK(watch_events_lock);
    1.11  
    1.12 @@ -543,11 +543,8 @@ void xenbus_dev_error(struct xenbus_devi
    1.13  	char *printf_buffer = NULL, *path_buffer = NULL;
    1.14  
    1.15  	printf_buffer = kmalloc(PRINTF_BUFFER_SIZE, GFP_KERNEL);
    1.16 -	if (printf_buffer == NULL) {
    1.17 -		printk("xenbus: failed to write error node for %s (%d): %d\n",
    1.18 -		       dev->nodename, err, errno);
    1.19 +	if (printf_buffer == NULL)
    1.20  		goto fail;
    1.21 -	}
    1.22  
    1.23  	len = sprintf(printf_buffer, "%i ", -err);
    1.24  	va_start(ap, fmt);
    1.25 @@ -560,8 +557,8 @@ void xenbus_dev_error(struct xenbus_devi
    1.26  	path_buffer = error_path(dev);
    1.27  
    1.28  	if (path_buffer == NULL) {
    1.29 -		printk("xenbus: failed to write error node for %s (%s): %d\n",
    1.30 -		       dev->nodename, printf_buffer, errno);
    1.31 +		printk("xenbus: failed to write error node for %s (%s)\n",
    1.32 +		       dev->nodename, printf_buffer);
    1.33  		goto fail;
    1.34  	}
    1.35  
    1.36 @@ -586,8 +583,8 @@ void xenbus_dev_ok(struct xenbus_device 
    1.37  		char *path_buffer = error_path(dev);
    1.38  
    1.39  		if (path_buffer == NULL) {
    1.40 -			printk("xenbus: failed to clear error node for %s: "
    1.41 -			       "%d\n", dev->nodename, errno);
    1.42 +			printk("xenbus: failed to clear error node for %s\n",
    1.43 +			       dev->nodename);
    1.44  			return;
    1.45  		}
    1.46