summaryrefslogtreecommitdiffstats
path: root/sys/x86
diff options
context:
space:
mode:
authorroyger <royger@FreeBSD.org>2015-01-20 12:28:24 +0000
committerroyger <royger@FreeBSD.org>2015-01-20 12:28:24 +0000
commit313e96ad334aae0ab1c78f7cdd21462fd5e91e22 (patch)
treedb7c7f8e92fd204402e5aa2f2547d77692ce34bd /sys/x86
parent827c65e7ef3341ba0cd7906e6e8417b2db035566 (diff)
downloadFreeBSD-src-313e96ad334aae0ab1c78f7cdd21462fd5e91e22.zip
FreeBSD-src-313e96ad334aae0ab1c78f7cdd21462fd5e91e22.tar.gz
loader: fix the size of MODINFOMD_MODULEP
The data in MODINFOMD_MODULEP is packed by the loader as a 4 byte type, but the amd64 kernel expects a vm_paddr_t, which is of size 8 bytes. Fix this by saving it as 8 bytes in the loader and retrieving it using the proper type in the kernel. Sponsored by: Citrix Systems R&D
Diffstat (limited to 'sys/x86')
-rw-r--r--sys/x86/xen/pv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/x86/xen/pv.c b/sys/x86/xen/pv.c
index e8cdca4..233bf3e 100644
--- a/sys/x86/xen/pv.c
+++ b/sys/x86/xen/pv.c
@@ -402,7 +402,7 @@ xen_pv_parse_preload_data(u_int64_t modulep)
* then calculating the offset with mod_start,
* which contains the relocated modulep address.
*/
- metadata = MD_FETCH(kmdp, MODINFOMD_MODULEP, int);
+ metadata = MD_FETCH(kmdp, MODINFOMD_MODULEP, vm_paddr_t);
off = HYPERVISOR_start_info->mod_start - metadata;
preload_bootstrap_relocate(off);
OpenPOWER on IntegriCloud