[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[2170] 2009-05-03 Pavel Roskin <address@hidden>
From: |
Pavel Roskin |
Subject: |
[2170] 2009-05-03 Pavel Roskin <address@hidden> |
Date: |
Sun, 03 May 2009 19:25:15 +0000 |
Revision: 2170
http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2170
Author: proski
Date: 2009-05-03 19:25:14 +0000 (Sun, 03 May 2009)
Log Message:
-----------
2009-05-03 Pavel Roskin <address@hidden>
* 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?\195?\173n <address@hidden>
Modified Paths:
--------------
trunk/grub2/ChangeLog
trunk/grub2/include/grub/memory.h
trunk/grub2/mmap/efi/mmap.c
trunk/grub2/mmap/i386/mmap.c
Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog 2009-05-03 19:04:59 UTC (rev 2169)
+++ trunk/grub2/ChangeLog 2009-05-03 19:25:14 UTC (rev 2170)
@@ -1,5 +1,10 @@
2009-05-03 Pavel Roskin <address@hidden>
+ * 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 <address@hidden>
+
* 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
Modified: trunk/grub2/include/grub/memory.h
===================================================================
--- trunk/grub2/include/grub/memory.h 2009-05-03 19:04:59 UTC (rev 2169)
+++ trunk/grub2/include/grub/memory.h 2009-05-03 19:25:14 UTC (rev 2170)
@@ -30,7 +30,7 @@
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);
Modified: trunk/grub2/mmap/efi/mmap.c
===================================================================
--- trunk/grub2/mmap/efi/mmap.c 2009-05-03 19:04:59 UTC (rev 2169)
+++ trunk/grub2/mmap/efi/mmap.c 2009-05-03 19:25:14 UTC (rev 2170)
@@ -218,7 +218,7 @@
}
/* 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,
Modified: trunk/grub2/mmap/i386/mmap.c
===================================================================
--- trunk/grub2/mmap/i386/mmap.c 2009-05-03 19:04:59 UTC (rev 2169)
+++ trunk/grub2/mmap/i386/mmap.c 2009-05-03 19:25:14 UTC (rev 2170)
@@ -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 @@
return 0;
}
- char * ret;
+ void *ret;
if (flags & GRUB_MMAP_MALLOC_LOW)
{
/* FIXME: use low-memory mm allocation once it's available. */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [2170] 2009-05-03 Pavel Roskin <address@hidden>,
Pavel Roskin <=