---

yaml --- r: 330407 b: refs/heads/master c: 4ed5978 h: refs/heads/master i: 330405: e939832 330403: 0438713 330399: cab2a2a v: v3
git-mirror · Oct 3, 2012 · 667ae56 · 667ae56
1 parent 013084f
commit 667ae56
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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 */