# HG changeset patch
# User emellor@xxxxxxxxxxxxxxxxxxxxxx
# Node ID c653a376cf52f0b2753d5a4dd65e6a6b01da4e96
# Parent 99ece3c069132a37d1e17dcd718fe08896584259
Remove recently added uses of errno, as these cause trouble on ia64 builds.
Signed-off-by: Ewan Mellor <ewan@xxxxxxxxxxxxx>
diff -r 99ece3c06913 -r c653a376cf52
linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c Mon Oct 24
14:18:31 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c Mon Oct 24
17:21:38 2005
@@ -81,7 +81,7 @@
static LIST_HEAD(watches);
static DEFINE_SPINLOCK(watches_lock);
-/* List of pending watch calbback events, and a lock to protect it. */
+/* List of pending watch callback events, and a lock to protect it. */
static LIST_HEAD(watch_events);
static DEFINE_SPINLOCK(watch_events_lock);
@@ -543,11 +543,8 @@
char *printf_buffer = NULL, *path_buffer = NULL;
printf_buffer = kmalloc(PRINTF_BUFFER_SIZE, GFP_KERNEL);
- if (printf_buffer == NULL) {
- printk("xenbus: failed to write error node for %s (%d): %d\n",
- dev->nodename, err, errno);
+ if (printf_buffer == NULL)
goto fail;
- }
len = sprintf(printf_buffer, "%i ", -err);
va_start(ap, fmt);
@@ -560,8 +557,8 @@
path_buffer = error_path(dev);
if (path_buffer == NULL) {
- printk("xenbus: failed to write error node for %s (%s): %d\n",
- dev->nodename, printf_buffer, errno);
+ printk("xenbus: failed to write error node for %s (%s)\n",
+ dev->nodename, printf_buffer);
goto fail;
}
@@ -586,8 +583,8 @@
char *path_buffer = error_path(dev);
if (path_buffer == NULL) {
- printk("xenbus: failed to clear error node for %s: "
- "%d\n", dev->nodename, errno);
+ printk("xenbus: failed to clear error node for %s\n",
+ dev->nodename);
return;
}
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|