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>
This commit is contained in:
proski 2009-05-03 19:25:14 +00:00
parent dfc31a22bb
commit 2fee74f1bb
4 changed files with 9 additions and 4 deletions

View file

@ -218,7 +218,7 @@ grub_mmap_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,

View file

@ -26,7 +26,7 @@
#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)
{
@ -48,7 +48,7 @@ grub_mmap_malign_and_register (grub_uint64_t align, grub_uint64_t size,
return 0;
}
char * ret;
void *ret;
if (flags & GRUB_MMAP_MALLOC_LOW)
{
/* FIXME: use low-memory mm allocation once it's available. */