restore patches lost when merging NMU diff

[debian/elilo] / bootparams.c

diff --git a/bootparams.c b/bootparams.c
index 8859fcc48c1a0864e3ee25210629c56bf3929598..da3d6642ae5e5603fa325dcc70cbba7a51704ee6 100644 (file)
--- 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