diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2014-02-26 14:20:56 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-02-26 14:20:56 -0800 |
| commit | 046f19cbffec3516d4f934863820fc242f33da3c (patch) | |
| tree | 620c5059639e966b09501dafc7a6d263ef11ff09 | |
| parent | fcfcd100c71e2f384d9c253e725c4f602c047b15 (diff) | |
| parent | 60797dd4984cde06c0545bf804af4482b09cd977 (diff) | |
| download | syslinux-046f19cbffec3516d4f934863820fc242f33da3c.tar.gz | |
Merge branch 'syslinux-5.xx'
Resolved Conflicts:
core/init.c
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
| -rw-r--r-- | core/bios.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/bios.c b/core/bios.c index 7ad10bb3..6de4f2d6 100644 --- a/core/bios.c +++ b/core/bios.c @@ -474,21 +474,21 @@ static inline void check_escapes(void) KbdFlags = oreg.eax.b[0]; /* Ctrl->skip 386 check */ - if (oreg.eax.b[0] & 0x04) { + if (!(oreg.eax.b[0] & 0x04)) { /* * Now check that there is sufficient low (DOS) memory * * NOTE: Linux doesn't use all of real_mode_seg, but we use * the same segment for COMBOOT images, which can use all 64K. */ - uint16_t mem; + uint32_t mem; __intcall(0x12, &ireg, &oreg); mem = ((uint32_t)__lowmem_heap) + min_lowmem_heap + 1023; mem = mem >> 10; - if (mem < oreg.eax.w[0]) { + if (oreg.eax.w[0] < mem) { char buf[256]; snprintf(buf, sizeof(buf), |