aboutsummaryrefslogtreecommitdiffstats
path: root/memdisk
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2010-03-30 16:17:59 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2010-03-30 16:17:59 -0700
commit52c9d5ba2af4e1f77aa2486a2af2bcab0b0af52c (patch)
tree0ef759bffc55ed0f7811805440f58412e6ba3d8f /memdisk
parentd6fb0861c55f062797c8706f484bd47ae0f94568 (diff)
parentdcecb9f395f3ca0da3df774cb6102d885894bf84 (diff)
downloadsyslinux-52c9d5ba2af4e1f77aa2486a2af2bcab0b0af52c.tar.gz
syslinux-52c9d5ba2af4e1f77aa2486a2af2bcab0b0af52c.tar.xz
syslinux-52c9d5ba2af4e1f77aa2486a2af2bcab0b0af52c.zip
Merge branch 'master' into pathbased
Resolved Conflicts: com32/modules/Makefile core/comboot.inc core/cpuinit.inc core/idle.inc Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'memdisk')
-rw-r--r--memdisk/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/memdisk/setup.c b/memdisk/setup.c
index bcb5d040..cec25ad3 100644
--- a/memdisk/setup.c
+++ b/memdisk/setup.c
@@ -648,7 +648,7 @@ static const struct geometry *get_disk_image_geometry(uint32_t where,
if (!hd_geometry.driveno)
hd_geometry.driveno = 0x80;
- if (*(uint16_t *) ((char *)where + 512 - 2) == 0xaa55) {
+ if (*(uint16_t *) ((char *)where + hd_geometry.offset + 512 - 2) == 0xaa55) {
for (i = 0; i < 4; i++) {
if (ptab[i].type && !(ptab[i].active & 0x7f)) {
s = (ptab[i].start_s & 0x3f);