From db8cf0c8e881d16054578a4e159e425b73ef52bb Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Thu, 23 Aug 2012 15:02:04 +0100 Subject: [PATCH] x86,cmdline: Fix setting skip_realmode boolean on no-real-mode and tboot options ...effect should be cumulative. Signed-off-by: Keir Fraser --- xen/arch/x86/boot/cmdline.S | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/boot/cmdline.S b/xen/arch/x86/boot/cmdline.S index deb1e9a344..05ffb941e5 100644 --- a/xen/arch/x86/boot/cmdline.S +++ b/xen/arch/x86/boot/cmdline.S @@ -164,13 +164,15 @@ cmdline_parse_early: pushl MB_cmdline(%ebx) call .Lfind_option test %eax,%eax - setnz sym_phys(skip_realmode) + setnz %al + or %al,sym_phys(skip_realmode) /* Check for 'tboot=' command-line option. */ movl $sym_phys(.Ltboot_opt),4(%esp) call .Lfind_option test %eax,%eax - setnz sym_phys(skip_realmode) /* tboot= implies no-real-mode */ + setnz %al + or %al,sym_phys(skip_realmode) /* tboot= implies no-real-mode */ .Lparse_edd: /* Check for 'edd=' command-line option. */ -- 2.30.2