forked from pool/grub2
b05b350108
- snapper rollback support (fate#317062) * add btrfs_follow_default.patch * add suse_btrfs_grub2_install.sh * add 80_suse_btrfs_snapshot * refresh grub2-snapper-plugin.sh - add grub2-x86_64-xen subpackage (bnc#863821) - ieee1275: check for IBM pseries emulated machine (bnc#869964) - added patches: * grub2-ppc64-build-ppc64-32bit.patch - Build ppc64 as 32bit - added patches: * grub2-ppc64-build-ppc64-32bit.patch - Rename PowerPC patches so it will have architecture in it's name - added patches: * grub2-ppc64le-01-Add-Little-Endian-support-for-Power64-to-the-build.patch * grub2-ppc64le-02-Build-grub-as-O1-until-we-add-savegpr-and-restgpr-ro.patch * grub2-ppc64le-03-disable-creation-of-vsx-and-altivec-instructions.patch * grub2-ppc64le-04-powerpc64-LE-s-linker-knows-how-to-handle-the-undefi.patch * grub2-ppc64le-05-grub-install-can-now-recognize-and-install-a-LE-grub.patch * grub2-ppc64le-06-set-the-ABI-version-to-0x02-in-the-e_flag-of-the-PPC.patch * grub2-ppc64le-07-Add-IEEE1275_ADDR-helper.patch * grub2-ppc64le-08-Fix-some-more-warnings-when-casting.patch * grub2-ppc64le-09-Add-powerpc64-types.patch * grub2-ppc64le-10-powerpc64-is-not-necessarily-BigEndian-anymore.patch * grub2-ppc64le-11-Fix-warnings-when-building-powerpc-linux-loader-64bi.patch * grub2-ppc64le-12-GRUB_ELF_R_PPC_-processing-is-applicable-only-for-32.patch OBS-URL: https://build.opensuse.org/request/show/228323 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=81
43 lines
1.7 KiB
Diff
43 lines
1.7 KiB
Diff
From 65dc046ba1f73ae2454ed6495145d645ad452596 Mon Sep 17 00:00:00 2001
|
|
From: Anton Blanchard <anton@samba.org>
|
|
Date: Wed, 29 Jan 2014 10:38:28 +1100
|
|
Subject: [PATCH 11/23] Fix warnings when building powerpc linux loader 64bit
|
|
|
|
Fix warnings when building powerpc linux loader 64bit
|
|
|
|
Signed-off-by: Ram Pai <linuxram@us.ibm.com>
|
|
From: Anton Blanchard <anton@samba.org>
|
|
---
|
|
grub-core/loader/powerpc/ieee1275/linux.c | 9 +++++----
|
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/grub-core/loader/powerpc/ieee1275/linux.c b/grub-core/loader/powerpc/ieee1275/linux.c
|
|
index 4a14f66..9dde053 100644
|
|
--- a/grub-core/loader/powerpc/ieee1275/linux.c
|
|
+++ b/grub-core/loader/powerpc/ieee1275/linux.c
|
|
@@ -141,9 +141,9 @@ grub_linux_boot (void)
|
|
grub_ieee1275_set_property (grub_ieee1275_chosen, "bootargs", linux_args,
|
|
grub_strlen (linux_args) + 1, &actual);
|
|
|
|
- grub_dprintf ("loader", "Entry point: 0x%x\n", linux_entry);
|
|
- grub_dprintf ("loader", "Initrd at: 0x%x, size 0x%x\n", initrd_addr,
|
|
- initrd_size);
|
|
+ grub_dprintf ("loader", "Entry point: 0x%lx\n", (unsigned long)linux_entry);
|
|
+ grub_dprintf ("loader", "Initrd at: 0x%lx, size 0x%lx\n",
|
|
+ (unsigned long)initrd_addr, (unsigned long)initrd_size);
|
|
grub_dprintf ("loader", "Boot arguments: %s\n", linux_args);
|
|
grub_dprintf ("loader", "Jumping to Linux...\n");
|
|
|
|
@@ -360,7 +360,8 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
|
|
if (addr == (grub_addr_t) -1)
|
|
goto fail;
|
|
|
|
- grub_dprintf ("loader", "Loading initrd at 0x%x, size 0x%x\n", addr, size);
|
|
+ grub_dprintf ("loader", "Loading initrd at 0x%lx, size 0x%lx\n",
|
|
+ (unsigned long)addr, (unsigned long)size);
|
|
|
|
if (grub_initrd_load (&initrd_ctx, argv, (void *) addr))
|
|
goto fail;
|
|
--
|
|
1.8.3.1
|