added 1 changeset to branch 'refs/remotes/xyzzy-github/x86_64' old head: b8a9a3a16073d8f474ee3415e208d04f4b58b4b0 new head: 3f017e90611b6b53186f72bd9f6aa837d15e588a ---------------------------------------------------------------------------- 3f017e9: Also need to fix the kernel_args_range addresses. [ Alex Smith <alex@xxxxxxxxxxxxxxxx> ] ---------------------------------------------------------------------------- Commit: 3f017e90611b6b53186f72bd9f6aa837d15e588a Author: Alex Smith <alex@xxxxxxxxxxxxxxxx> Date: Wed Jun 27 09:33:31 2012 UTC ---------------------------------------------------------------------------- 1 file changed, 12 insertions(+), 2 deletions(-) src/system/boot/platform/bios_ia32/long.cpp | 14 ++++++++++++-- ---------------------------------------------------------------------------- diff --git a/src/system/boot/platform/bios_ia32/long.cpp b/src/system/boot/platform/bios_ia32/long.cpp index 4ae8dc3..cb7d2df 100644 --- a/src/system/boot/platform/bios_ia32/long.cpp +++ b/src/system/boot/platform/bios_ia32/long.cpp @@ -225,10 +225,20 @@ convert_kernel_args() image = next; } + // Set correct kernel args range addresses. + dprintf("kernel args ranges:\n"); + for (uint32 i = 0; i < gKernelArgs.num_kernel_args_ranges; i++) { + gKernelArgs.kernel_args_range[i].start = fix_address( + gKernelArgs.kernel_args_range[i].start); + dprintf(" base %#018" B_PRIx64 ", length %#018" B_PRIx64 "\n", + gKernelArgs.kernel_args_range[i].start, + gKernelArgs.kernel_args_range[i].size); + } + // Set correct kernel stack addresses. for (uint32 i = 0; i < gKernelArgs.num_cpus; i++) { - gKernelArgs.cpu_kstack[i].start - = fix_address(gKernelArgs.cpu_kstack[i].start); + gKernelArgs.cpu_kstack[i].start = fix_address( + gKernelArgs.cpu_kstack[i].start); } // Fix driver settings files.