From ab7a0d7323fd2f6eb4f55da50386378d6a7a7af0 Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Wed, 29 Jan 2014 10:36:41 +1100 Subject: [PATCH 08/23] Fix some more warnings when casting. Signed-off-by: Ram Pai From: Anton Blanchard --- grub-core/disk/ieee1275/ofdisk.c | 2 +- grub-core/lib/powerpc/relocator.c | 8 ++++---- grub-core/net/drivers/ieee1275/ofnet.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/grub-core/disk/ieee1275/ofdisk.c b/grub-core/disk/ieee1275/ofdisk.c index 1b72f06..d785d6a 100644 --- a/grub-core/disk/ieee1275/ofdisk.c +++ b/grub-core/disk/ieee1275/ofdisk.c @@ -244,7 +244,7 @@ dev_iterate (const struct grub_ieee1275_devalias *alias) { grub_uint64_t *ptr; - ptr = *(grub_uint64_t **) (args.table + 4 + 8 * i); + ptr = *(grub_uint64_t **) ((grub_addr_t)args.table + 4 + 8 * i); while (*ptr) { grub_snprintf (bufptr, 32, "/disk@%" PRIxGRUB_UINT64_T, *ptr++); diff --git a/grub-core/lib/powerpc/relocator.c b/grub-core/lib/powerpc/relocator.c index bdf2b11..4bac96f 100644 --- a/grub-core/lib/powerpc/relocator.c +++ b/grub-core/lib/powerpc/relocator.c @@ -84,8 +84,8 @@ grub_cpu_relocator_backward (void *ptr0, void *src, void *dest, grub_size_t size) { void *ptr = ptr0; - write_reg (8, (grub_uint32_t) src, &ptr); - write_reg (9, (grub_uint32_t) dest, &ptr); + write_reg (8, (grub_uint32_t) (grub_addr_t) src, &ptr); + write_reg (9, (grub_uint32_t) (grub_addr_t) dest, &ptr); write_reg (10, (grub_uint32_t) size, &ptr); grub_memcpy (ptr, &grub_relocator_backward_start, RELOCATOR_SRC_SIZEOF (backward)); @@ -96,8 +96,8 @@ grub_cpu_relocator_forward (void *ptr0, void *src, void *dest, grub_size_t size) { void *ptr = ptr0; - write_reg (8, (grub_uint32_t) src, &ptr); - write_reg (9, (grub_uint32_t) dest, &ptr); + write_reg (8, (grub_uint32_t) (grub_addr_t) src, &ptr); + write_reg (9, (grub_uint32_t) (grub_addr_t) dest, &ptr); write_reg (10, (grub_uint32_t) size, &ptr); grub_memcpy (ptr, &grub_relocator_forward_start, RELOCATOR_SRC_SIZEOF (forward)); diff --git a/grub-core/net/drivers/ieee1275/ofnet.c b/grub-core/net/drivers/ieee1275/ofnet.c index ea6456f..07c8446 100644 --- a/grub-core/net/drivers/ieee1275/ofnet.c +++ b/grub-core/net/drivers/ieee1275/ofnet.c @@ -395,7 +395,7 @@ search_net_devices (struct grub_ieee1275_devalias *alias) grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory")); } else - card->txbuf = (void *) args.result; + card->txbuf = (void *) (grub_addr_t) args.result; } else card->txbuf = grub_zalloc (card->txbufsize); -- 1.8.3.1