diff --git a/[refs] b/[refs]
index 4af82ea20b97..38b4142daf4a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e3d88602814e5fd5b88d5c73be3305060c473b6
+refs/heads/master: 4ed5978bdd99114db7773cb3d78f2998bd17f694
diff --git a/trunk/include/xen/xen.h b/trunk/include/xen/xen.h
index 2c0d3a56c749..a74d4362c4f8 100644
--- a/trunk/include/xen/xen.h
+++ b/trunk/include/xen/xen.h
@@ -24,7 +24,7 @@ extern enum xen_domain_type xen_domain_type;
 #include <asm/xen/hypervisor.h>
 
 #define xen_initial_domain()	(xen_domain() && \
-				 xen_start_info->flags & SIF_INITDOMAIN)
+				 xen_start_info && xen_start_info->flags & SIF_INITDOMAIN)
 #else  /* !CONFIG_XEN_DOM0 */
 #define xen_initial_domain()	(0)
 #endif	/* CONFIG_XEN_DOM0 */