Index: build-32-release304-13133/tools/xenfb/xenfb.c
===================================================================
--- build-32-release304-13133.orig/tools/xenfb/xenfb.c
+++ build-32-release304-13133/tools/xenfb/xenfb.c
@@ -367,12 +367,12 @@ static int xenfb_map_fb(struct xenfb_pri
 		 */
 		uint32_t *ptr32 = NULL;
 		uint32_t *ptr64 = NULL;
-#if defined(__i386_)
-		ptr32 = page->pd;
+#if defined(__i386__)
+		ptr32 = (void*)page->pd;
 		ptr64 = ((void*)page->pd) + 4;
 #elif defined(__x86_64__)
 		ptr32 = ((void*)page->pd) - 4;
-		ptr64 = page->pd;
+		ptr64 = (void*)page->pd;
 #endif
 		if (ptr32) {
 			if (0 == ptr32[1]) {
@@ -388,7 +388,7 @@ static int xenfb_map_fb(struct xenfb_pri
 		/* 64bit dom0, 32bit domU */
 		mode = 32;
 		pd   = ((void*)page->pd) - 4;
-#elif defined(__i386_)
+#elif defined(__i386__)
 	} else if (0 == strcmp(xenfb->protocol, XEN_IO_PROTO_ABI_X86_64)) {
 		/* 32bit dom0, 64bit domU */
 		mode = 64;
@@ -560,10 +560,10 @@ int xenfb_attach_dom(struct xenfb *xenfb
 	if (xenfb_wait_for_frontend_initialised(&xenfb->kbd) < 0)
 		goto error;
 
-	if (xenfb_bind(&xenfb->fb) < 0)
-		goto error;
 	if (xenfb_bind(&xenfb->kbd) < 0)
 		goto error;
+	if (xenfb_bind(&xenfb->fb) < 0)
+		goto error;
 
 	if (xenfb_xs_scanf1(xsh, xenfb->fb.otherend, "feature-update",
 			    "%d", &val) < 0)