diff --git a/drivers/xen/v2v/v2v.c b/drivers/xen/v2v/v2v.c
-index 57d51be..304f421 100644
+index 57d51be..1bcab10 100644
--- a/drivers/xen/v2v/v2v.c
+++ b/drivers/xen/v2v/v2v.c
@@ -792,7 +792,7 @@ v2v_get_remote_state(struct v2v_channel *channel, enum v2v_endpoint_state *state
xenbus_transaction_end(xbt, 1);
- wait_event(channel->wait_state.wait_event,
- atomic_xchg(&channel->wait_state.wait_condition, 0) == 1);
-+ if (!noblock)
++ if (!nonblock)
+ wait_event(channel->wait_state.wait_event,
+ atomic_xchg(&channel->wait_state.wait_condition, 0) == 1);
/* ### get the event reason, should be only the control event right now */
EPRINTK("v2v_accept - error commiting xs transaction - err: %d\n", err);
return err;
}
-+ if (noblock)
++ if (nonblock)
+ return -EAGAIN;
break; /* try again */
}
}
diff --git a/drivers/xen/v2v/v2vops.c b/drivers/xen/v2v/v2vops.c
-index 83854a2..66bfe93 100644
+index 038dc86..f67bdcf 100644
--- a/drivers/xen/v2v/v2vops.c
+++ b/drivers/xen/v2v/v2vops.c
@@ -752,7 +752,7 @@ v2vdrv_listen_accept(struct v2vdrv_context *ctx)