aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--memdisk/mstructs.h5
-rw-r--r--memdisk/setup.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/memdisk/mstructs.h b/memdisk/mstructs.h
index 47dffe95..e060aceb 100644
--- a/memdisk/mstructs.h
+++ b/memdisk/mstructs.h
@@ -106,7 +106,10 @@ struct mdi {
MEMDISK_PACKED_PREFIX
struct mBFT {
struct acpi_description_header acpi;
- struct safe_hook *safe_hook; /* "Safe hook" physical address */
+ union {
+ struct safe_hook *ptr;
+ uint32_t phys_addr;
+ } safe_hook; /* "Safe hook" physical address */
struct mdi mdi;
} MEMDISK_PACKED_POSTFIX;
diff --git a/memdisk/setup.c b/memdisk/setup.c
index a9ae63d0..ffaa2c66 100644
--- a/memdisk/setup.c
+++ b/memdisk/setup.c
@@ -1132,7 +1132,7 @@ void setup(const struct real_mode_args *rm_args_ptr)
hptr->safe_hook.mBFT.ptr->acpi.signature[1] = 'B';
hptr->safe_hook.mBFT.ptr->acpi.signature[2] = 'F';
hptr->safe_hook.mBFT.ptr->acpi.signature[3] = 'T';
- hptr->safe_hook.mBFT.ptr->safe_hook = &hptr->safe_hook;
+ hptr->safe_hook.mBFT.ptr->safe_hook.ptr = &hptr->safe_hook;
hptr->safe_hook.mBFT.ptr->acpi.checksum =
-checksum_buf(hptr->safe_hook.mBFT.ptr,
hptr->safe_hook.mBFT.ptr->acpi.length);