From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Sun, 8 Dec 2013 17:12:20 +0000 (+0100)
Subject: 	Remove grub_memalign on emu.
X-Git-Tag: grub-2.02-beta1~132
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50b3a68db94aa9733160721b203b2a3d257842e7;p=thirdparty%2Fgrub.git

	Remove grub_memalign on emu.
---

diff --git a/ChangeLog b/ChangeLog
index e7b4e9fe1..2ee7d46ba 100644
--- 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 10e1cc0d9..f262e95e3 100644
--- 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 47b0506ed..e97ecd23e 100644
--- 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 c6660af71..28e2e53eb 100644
--- 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__);