diff options
| author | Keir Fraser <keir@xen.org> | 2012-08-23 15:02:04 +0100 |
|---|---|---|
| committer | Keir Fraser <keir@xen.org> | 2012-08-23 15:02:04 +0100 |
| commit | db8cf0c8e881d16054578a4e159e425b73ef52bb (patch) | |
| tree | 625c6cae074bcb1ce6677f30478edb1c74feb9ab | |
| parent | 6de33e7c3301393580679dba4914c355782c4efb (diff) | |
| download | xen-db8cf0c8e881d16054578a4e159e425b73ef52bb.tar.gz xen-db8cf0c8e881d16054578a4e159e425b73ef52bb.tar.bz2 xen-db8cf0c8e881d16054578a4e159e425b73ef52bb.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>
| -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 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. */ |