From 313e96ad334aae0ab1c78f7cdd21462fd5e91e22 Mon Sep 17 00:00:00 2001 From: royger Date: Tue, 20 Jan 2015 12:28:24 +0000 Subject: 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 --- sys/x86/xen/pv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sys/x86') 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); -- cgit v1.1