Remove grub_memalign on emu.

diff --git a/ChangeLog b/ChangeLog
index e7b4e9fe14f86ab6bf831a048d8fb8d2767ad08f..2ee7d46ba6a825e5282008a03c4936041abf0890 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-08  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Remove grub_memalign on emu.
+
 2013-12-08  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/kern/ia64/efi/init.c: Fix alignment code so it doesn't

diff --git a/grub-core/kern/emu/mm.c b/grub-core/kern/emu/mm.c
index 10e1cc0d910a8f1f605bd573fb17747281dff6e3..f262e95e3888960f36d88798593a931f9f7c6d83 100644 (file)
--- a/grub-core/kern/emu/mm.c
+++ b/grub-core/kern/emu/mm.c
@@ -62,26 +62,3 @@ grub_realloc (void *ptr, grub_size_t size)
     grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory"));
   return ret;
 }
-
-#if defined(HAVE_POSIX_MEMALIGN) || defined(HAVE_MEMALIGN)
-void *
-grub_memalign (grub_size_t align, grub_size_t size)
-{
-  void *p;
-
-  if (align < sizeof (void *))
-    align = sizeof (void *);
-
-#if defined(HAVE_POSIX_MEMALIGN)
-  if (posix_memalign (&p, align, size) != 0)
-    p = 0;
-#elif defined(HAVE_MEMALIGN)
-  p = memalign (align, size);
-#endif
-
-  if (!p)
-    grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory"));
-
-  return p;
-}
-#endif

diff --git a/grub-core/net/netbuff.c b/grub-core/net/netbuff.c
index 47b0506ed8619b7ea818fa92681b5eed49651303..e97ecd23e9c5aa33f74534e7a43687dbd7c27752 100644 (file)
--- a/grub-core/net/netbuff.c
+++ b/grub-core/net/netbuff.c
@@ -83,7 +83,11 @@ grub_netbuff_alloc (grub_size_t len)
     len = NETBUFFMINLEN;
 
   len = ALIGN_UP (len, NETBUFF_ALIGN);
+#ifdef GRUB_MACHINE_EMU
+  data = grub_malloc (len + sizeof (*nb));
+#else
   data = grub_memalign (NETBUFF_ALIGN, len + sizeof (*nb));
+#endif
   if (!data)
     return NULL;
   nb = (struct grub_net_buff *) ((grub_properly_aligned_t *) data

diff --git a/include/grub/mm.h b/include/grub/mm.h
index c6660af718c619552fb8381b52726c25009afdc0..28e2e53eb320ca1148511e957ca4a5686a9408f9 100644 (file)
--- a/include/grub/mm.h
+++ b/include/grub/mm.h
@@ -33,7 +33,9 @@ void *EXPORT_FUNC(grub_malloc) (grub_size_t size);
 void *EXPORT_FUNC(grub_zalloc) (grub_size_t size);
 void EXPORT_FUNC(grub_free) (void *ptr);
 void *EXPORT_FUNC(grub_realloc) (void *ptr, grub_size_t size);
+#ifndef GRUB_MACHINE_EMU
 void *EXPORT_FUNC(grub_memalign) (grub_size_t align, grub_size_t size);
+#endif
 
 void grub_mm_check_real (const char *file, int line);
 #define grub_mm_check() grub_mm_check_real (GRUB_FILE, __LINE__);