X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=bootparams.c;h=576a57942973f7c93b1e79b7ecf4e18cb8e72931;hb=4d5dcc08ba40d496e8253cd32fd8b15fac984c74;hp=8859fcc48c1a0864e3ee25210629c56bf3929598;hpb=2344eb51e123a29ed29ed03e6b4d56190d8d7c43;p=debian%2Felilo

diff --git a/bootparams.c b/bootparams.c
index 8859fcc..576a579 100644
--- a/bootparams.c
+++ b/bootparams.c
@@ -78,12 +78,12 @@ create_boot_params(CHAR16 *args, memdesc_t *initrd, memdesc_t *vmcode, UINTN *co
 		return 0;
 	}
 
-	VERB_PRT(3, Print(L"boot params @ 0x%lx\n", bp));
+	VERB_PRT(3, Print(L"boot params @ " PTR_FMT "\n", bp));
 
 /* XXX: need to fix this for 3.5 */
 #ifdef CONFIG_ia64
        cp = ((CHAR8 *)bp) + BOOT_PARAM_MEMSIZE - cmdline_size;
-#elif defined CONFIG_ia32
+#elif defined CONFIG_ia32 || CONFIG_x86_64
        cp = ((CHAR8 *)bp) + BOOT_PARAM_MEMSIZE - 2048;
 #endif
 
@@ -96,6 +96,8 @@ create_boot_params(CHAR16 *args, memdesc_t *initrd, memdesc_t *vmcode, UINTN *co
 	 */
 	Memset(bp, 0, BOOT_PARAM_MEMSIZE);
 
+	U2ascii(args, cp, cmdline_size);
+
 	if (sysdeps_create_boot_params(bp, cp, initrd, vmcode, cookie) == -1) return 0;
 
 	/*