[Xen-changelog] [xen-unstable] [IA64] don't dereference xen_start_info when running on raw hardware

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User awilliam@xxxxxxxxxxxx
# Date 1166557206 25200
# Node ID 105ac9be9b3d77797d942d59476d0e05bc42af43
# Parent  6e68e8a8cc99717b372c482efa0e153e868ae6f4
[IA64] don't dereference xen_start_info when running on raw hardware

Check we are running under Xen before trying to dereference
xen_start_info! xen_start_info is NULL on ia64 if running raw
hardware.  Based on patch by Jes Sorensen <jes@xxxxxxx>

Signed-off-by: Alex Williamson <alex.williamson@xxxxxx>
---
 linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

diff -r 6e68e8a8cc99 -r 105ac9be9b3d 
linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h
--- a/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h        Mon Dec 18 
10:56:34 2006 -0700
+++ b/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h        Tue Dec 19 
12:40:06 2006 -0700
@@ -215,7 +215,8 @@ asmlinkage int xprintk(const char *fmt, 
 #endif /* CONFIG_XEN || CONFIG_VMX_GUEST */
 
 #ifdef CONFIG_XEN_PRIVILEGED_GUEST
-#define is_initial_xendomain() (xen_start_info->flags & SIF_INITDOMAIN)
+#define is_initial_xendomain()                                         \
+       (is_running_on_xen() ? xen_start_info->flags & SIF_INITDOMAIN : 0)
 #else
 #define is_initial_xendomain() 0
 #endif

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog