From: Keir Fraser <keir@xen.org>
Date: Thu, 23 Aug 2012 14:02:04 +0000 (+0100)
Subject: x86,cmdline: Fix setting skip_realmode boolean on no-real-mode and tboot options
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~8031
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=db8cf0c8e881d16054578a4e159e425b73ef52bb;p=xen.git

x86,cmdline: Fix setting skip_realmode boolean on no-real-mode and tboot options
...effect should be cumulative.

Signed-off-by: Keir Fraser <keir@xen.org>
---

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. */