2009-05-03 Pavel Roskin <proski@gnu.org>
+ * mmap/efi/mmap.c (grub_mmap_malign_and_register): Return void*,
+ not char*.
+ * mmap/i386/mmap.c (grub_mmap_malign_and_register): Likewise.
+ Suggested by Javier Martín <lordhabbit@gmail.com>
+
* util/i386/pc/grub-mkrescue.in: Allow for the case when
efiemu??.o doesn't exist.
* util/i386/pc/grub-install.in: Likewise. Use "cp -f" for
int grub_mmap_register (grub_uint64_t start, grub_uint64_t size, int type);
grub_err_t grub_mmap_unregister (int handle);
-char *grub_mmap_malign_and_register (grub_uint64_t align, grub_uint64_t size,
+void *grub_mmap_malign_and_register (grub_uint64_t align, grub_uint64_t size,
int *handle, int type, int flags);
void grub_mmap_free_and_unregister (int handle);
}
/* Result is always page-aligned. */
-char *
+void *
grub_mmap_malign_and_register (grub_uint64_t align __attribute__ ((unused)),
grub_uint64_t size,
int *handle, int type,
#ifndef GRUB_MMAP_REGISTER_BY_FIRMWARE
-char *
+void *
grub_mmap_malign_and_register (grub_uint64_t align, grub_uint64_t size,
int *handle, int type, int flags)
{
return 0;
}
- char * ret;
+ void *ret;
if (flags & GRUB_MMAP_MALLOC_LOW)
{
/* FIXME: use low-memory mm allocation once it's available. */