* grub-core/kern/emu/cache.c [__ia64__]: Use our cache cleaning routine

	on ia64 as __clear_cache is a dummy on ia64.

diff --git a/ChangeLog b/ChangeLog
index 9ce084d582485bc197ee020691585af1ea8a10c5..f329e87ef778cf72fa36fbffaa5b15da969a8849 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-09  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/kern/emu/cache.c [__ia64__]: Use our cache cleaning routine
+       on ia64 as __clear_cache is a dummy on ia64.
+
 2013-12-09  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/kern/ia64/dl_helper.c (grub_ia64_dl_get_tramp_got_size):

diff --git a/grub-core/kern/emu/cache.c b/grub-core/kern/emu/cache.c
index b6f6faca236af063e7b65514668a2db7edfb53a6..07be6756f9425179ff0f902210d9a9ad08285cd5 100644 (file)
--- a/grub-core/kern/emu/cache.c
+++ b/grub-core/kern/emu/cache.c
@@ -1,7 +1,12 @@
+#ifndef GRUB_MACHINE_EMU
+#error "This source is only meant for grub-emu platform"
+#endif
 
 #include <grub/cache.h>
 
-#if defined(__ia64__) || defined (__arm__) || defined (__aarch64__)
+#if defined(__ia64__)
+#include "../ia64/cache.c"
+#elif defined (__arm__) || defined (__aarch64__)
 
 void __clear_cache (char *beg, char *end);