aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/xen
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy@goop.org>2007-12-10 16:00:41 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-10 22:46:58 -0500
commit7999f4b4e56d36265d789d52bb0c0bb0167346a7 (patch)
treedb2927bade6b7f5019084a4fa388eb6d6cbc1e98 /arch/x86/xen
parentc34c15b02e0af7e235f84ca1471747ee1cbb1b87 (diff)
xen: relax signature check
Some versions of Xen 3.x set their magic number to "xen-3.[12]", so relax the test to match them. Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86/xen')
-rw-r--r--arch/x86/xen/enlighten.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 94c39aaf695f..b6af3ea43c73 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1131,7 +1131,7 @@ asmlinkage void __init xen_start_kernel(void)
1131 if (!xen_start_info) 1131 if (!xen_start_info)
1132 return; 1132 return;
1133 1133
1134 BUG_ON(memcmp(xen_start_info->magic, "xen-3.0", 7) != 0); 1134 BUG_ON(memcmp(xen_start_info->magic, "xen-3", 5) != 0);
1135 1135
1136 /* Install Xen paravirt ops */ 1136 /* Install Xen paravirt ops */
1137 pv_info = xen_info; 1137 pv_info = xen_info;