vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2009-05-03 Pavel Roskin <proski@gnu.org>

Browse source 
* 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
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,5 +1,10 @@
2009-05-03 Pavel Roskin <proski@gnu.org> 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 * util/i386/pc/grub-mkrescue.in: Allow for the case when
efiemu??.o doesn't exist. efiemu??.o doesn't exist.
* util/i386/pc/grub-install.in: Likewise. Use "cp -f" for * util/i386/pc/grub-install.in: Likewise. Use "cp -f" for

2
include/grub/memory.h
View file

@ -30,7 +30,7 @@ grub_err_t grub_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t,
int grub_mmap_register (grub_uint64_t start, grub_uint64_t size, int type); int grub_mmap_register (grub_uint64_t start, grub_uint64_t size, int type);
grub_err_t grub_mmap_unregister (int handle); 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); int *handle, int type, int flags);
void grub_mmap_free_and_unregister (int handle); void grub_mmap_free_and_unregister (int handle);

2
mmap/efi/mmap.c
View file

@ -218,7 +218,7 @@ grub_mmap_unregister (int handle)
} }
/* Result is always page-aligned. */ /* Result is always page-aligned. */
char * void *
grub_mmap_malign_and_register (grub_uint64_t align __attribute__ ((unused)), grub_mmap_malign_and_register (grub_uint64_t align __attribute__ ((unused)),
grub_uint64_t size, grub_uint64_t size,
int *handle, int type, int *handle, int type,

4
mmap/i386/mmap.c
View file

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