diff options
| author | Keir Fraser <keir@xen.org> | 2012-09-20 10:59:17 +0200 |
|---|---|---|
| committer | Keir Fraser <keir@xen.org> | 2012-09-20 10:59:17 +0200 |
| commit | 5bd668cda8102ea35957a6a0db18a29efcaf0df5 (patch) | |
| tree | c7084bdf3e2e0168795c0d50b1c0a8633444d422 | |
| parent | b0a17100ae1865a55de8b34c7206d682d44a65d0 (diff) | |
| download | xen-5bd668cda8102ea35957a6a0db18a29efcaf0df5.tar.gz xen-5bd668cda8102ea35957a6a0db18a29efcaf0df5.tar.bz2 xen-5bd668cda8102ea35957a6a0db18a29efcaf0df5.zip | |
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>
xen-unstable changeset: 25773:b7e66cabb70f
xen-unstable date: Thu Aug 23 14:02:04 UTC 2012
| -rw-r--r-- | xen/arch/x86/boot/cmdline.S | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xen/arch/x86/boot/cmdline.S b/xen/arch/x86/boot/cmdline.S index d993bde1f7..1b5d546730 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 bootsym_phys(skip_realmode) + setnz %al + or %al,bootsym_phys(skip_realmode) /* Check for 'tboot=' command-line option. */ movl $sym_phys(.Ltboot_opt),4(%esp) call .Lfind_option test %eax,%eax - setnz bootsym_phys(skip_realmode) /* tboot= implies no-real-mode */ + setnz %al + or %al,bootsym_phys(skip_realmode) /* tboot= implies no-real-mode */ .Lparse_edd: /* Check for 'edd=' command-line option. */ |